-
Notifications
You must be signed in to change notification settings - Fork 2
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. Fixes pypa#10020
- Loading branch information
Ben Darnell
committed
May 28, 2021
1 parent
74580b1
commit 0b187f2
Showing
3 changed files
with
20 additions
and
1 deletion.
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 @@ | ||
The presence of an old version of Tornado (before 4.1) in the environment no longer breaks 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,16 @@ | ||
diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py | ||
index 5f8cb50..571d2a3 100644 | ||
--- a/src/pip/_vendor/tenacity/__init__.py | ||
+++ b/src/pip/_vendor/tenacity/__init__.py | ||
@@ -23,7 +23,9 @@ except ImportError: | ||
iscoroutinefunction = None | ||
|
||
try: | ||
- import tornado | ||
+ # Pip does not currently vendor Tornado, so this will take the | ||
+ # ImportError path. | ||
+ from pip._vendor import tornado | ||
except ImportError: | ||
tornado = None | ||
|
||
|