From b4cd6a2d5e6cbd8bb9a1200a16459dc4671fe3fc Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Jan 20 2025 11:32:52 +0000 Subject: Update to 1.3.3 Related-to: https://review.rdoproject.org/r/q/Ied9d848fb3bc24d9fd5c36a7c77f3b071ccd341d --- diff --git a/SOURCES/0001-Replaced-bundled-code-with-using-six.patch b/SOURCES/0001-Replaced-bundled-code-with-using-six.patch new file mode 100644 index 0000000..801a299 --- /dev/null +++ b/SOURCES/0001-Replaced-bundled-code-with-using-six.patch @@ -0,0 +1,92 @@ +From 2f5e186341cef8706c6f720f19142108898e8e93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Fri, 5 Sep 2014 14:36:25 +0200 +Subject: [PATCH] Replaced bundled code with using six + +Conflicts: + setup.py +(cherry picked from commit 062c5ba16b414770969871b3494f582402476985) +--- + requirements.txt | 1 + + retrying.py | 28 ++-------------------------- + 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 + +diff --git a/setup.py b/setup.py +index 7793b8f..1772179 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,6 +29,9 @@ CLASSIFIERS = [ + 'Topic :: Utilities', + ] + ++with open('requirements.txt') as file_requirements: ++ requirements = file_requirements.read().splitlines() ++ + settings.update( + name='retrying', + version='1.2.3', +@@ -42,6 +45,7 @@ settings.update( + keywords="decorator decorators retry retrying exception exponential backoff", + py_modules= ['retrying'], + test_suite="test_retrying", ++ install_requires=requirements, + ) + +