summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Moore <p.f.moore@gmail.com>2023-04-02 14:43:48 +0100
committerPaul Moore <p.f.moore@gmail.com>2023-04-02 14:43:48 +0100
commitd2852d0ad2261880b25f7b137ae89c8e5bbeae65 (patch)
tree61ec5e63dc513ad0ccf749faed204c624b01e35a /tools
parentd7e02483264703d6210e8c28937dcf1d9f547796 (diff)
downloadpip-d2852d0ad2261880b25f7b137ae89c8e5bbeae65.tar.gz
Upgrade tenacity to 8.2.2
Diffstat (limited to 'tools')
-rw-r--r--tools/vendoring/patches/tenacity.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/vendoring/patches/tenacity.patch b/tools/vendoring/patches/tenacity.patch
index 85b29c60c..c87b1c5b2 100644
--- a/tools/vendoring/patches/tenacity.patch
+++ b/tools/vendoring/patches/tenacity.patch
@@ -2,14 +2,14 @@ diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__i
index 88c28d2d6..086ad46e1 100644
--- a/src/pip/_vendor/tenacity/__init__.py
+++ b/src/pip/_vendor/tenacity/__init__.py
-@@ -76,10 +76,12 @@ from .after import after_nothing # noqa
+@@ -82,10 +82,12 @@ from .after import after_nothing # noqa
from .before_sleep import before_sleep_log # noqa
from .before_sleep import before_sleep_nothing # noqa
-try:
-- import tornado # type: ignore
+- import tornado
-except ImportError:
-- tornado = None # type: ignore
+- tornado = None
+# Replace a conditional import with a hard-coded None so that pip does
+# not attempt to use tornado even if it is present in the environment.
+# If tornado is non-None, tenacity will attempt to execute some code
@@ -22,7 +22,7 @@ index 88c28d2d6..086ad46e1 100644
--- a/src/pip/_vendor/tenacity/__init__.py
+++ b/src/pip/_vendor/tenacity/__init__.py
-@@ -190,7 +190,7 @@ class RetryError(Exception):
+@@ -153,7 +153,7 @@ class RetryError(Exception):
self.last_attempt = last_attempt
super().__init__(last_attempt)