-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid importing a non-vendored version of Tornado
Code depending on this conditional import could break if an old version of Tornado is present in the environment, rendering pip unusable.
- Loading branch information
Showing
3 changed files
with
28 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Remove unused optional ``tornado`` import in vendored ``tenacity`` to prevent old versions of Tornado from breaking pip. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py | ||
index 5f8cb5058..42e9d8940 100644 | ||
--- a/src/pip/_vendor/tenacity/__init__.py | ||
+++ b/src/pip/_vendor/tenacity/__init__.py | ||
@@ -22,10 +22,12 @@ try: | ||
except ImportError: | ||
iscoroutinefunction = None | ||
|
||
-try: | ||
- import tornado | ||
-except ImportError: | ||
- 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 | ||
+# that is sensitive to the version of tornado, which could break pip | ||
+# if an old version is found. | ||
+tornado = None | ||
|
||
import sys | ||
import threading |