diff options
| author | Haïkel Guémar <hguemar@fedoraproject.org> | 2014-09-05 14:36:25 +0200 |
|---|---|---|
| committer | Haïkel Guémar <hguemar@fedoraproject.org> | 2014-09-05 15:12:45 +0200 |
| commit | 062c5ba16b414770969871b3494f582402476985 (patch) | |
| tree | 238a75e832639b428f6b495cc0be10581c5bdbed | |
| parent | 30b068f26af13236e8b50f18feeb237023ab43b1 (diff) | |
| download | retrying-062c5ba16b414770969871b3494f582402476985.tar.gz | |
Replaced bundled code with using six
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | retrying.py | 28 | ||||
| -rw-r--r-- | setup.py | 4 |
3 files changed, 7 insertions, 26 deletions
diff --git a/requirements.txt b/requirements.txt index e69de29..ffe2fce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1 @@ +six diff --git a/retrying.py b/retrying.py index 50fc439..9f0a2a0 100644 --- a/retrying.py +++ b/retrying.py @@ -36,35 +36,11 @@ ## ---------------------------------------------------------------------------- import random +import six import sys import time import traceback -# Python 3 compatibility hacks, pilfered from https://pypi.python.org/pypi/six/1.6.1 -PY3 = sys.version_info[0] == 3 -if PY3: - def reraise(tp, value, tb=None): - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value - -else: - def exec_(_code_, _globs_=None, _locs_=None): - """Execute code in a namespace.""" - if _globs_ is None: - frame = sys._getframe(1) - _globs_ = frame.f_globals - if _locs_ is None: - _locs_ = frame.f_locals - del frame - elif _locs_ is None: - _locs_ = _globs_ - exec("""exec _code_ in _globs_, _locs_""") - - - exec_("""def reraise(tp, value, tb=None): - raise tp, value, tb -""") # sys.maxint / 2, since Python 3.2 doesn't have a sys.maxint... MAX_WAIT = 1073741823 @@ -282,7 +258,7 @@ class Attempt(object): if wrap_exception: raise RetryError(self) else: - reraise(self.value[0], self.value[1], self.value[2]) + six.reraise(self.value[0], self.value[1], self.value[2]) else: return self.value @@ -35,6 +35,9 @@ with open('README.rst') as file_readme: with open('HISTORY.rst') as file_history: history = file_history.read() +with open('requirements.txt') as file_requirements: + requirements = file_requirements.read().splitlines() + settings.update( name='retrying', version='1.2.4-dev', @@ -47,6 +50,7 @@ settings.update( keywords="decorator decorators retry retrying exception exponential backoff", py_modules= ['retrying'], test_suite="test_retrying", + install_requires=requirements, ) |