-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10466 from pradyunsg/vendoring-upgrade
Bump to vendoring 1.0.x
- Loading branch information
Showing
11 changed files
with
42 additions
and
18 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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
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,29 @@ | ||
diff --git a/src/pip/_vendor/urllib3/contrib/securetransport.py b/src/pip/_vendor/urllib3/contrib/securetransport.py | ||
index b97555454..189132baa 100644 | ||
--- a/src/pip/_vendor/urllib3/contrib/securetransport.py | ||
+++ b/src/pip/_vendor/urllib3/contrib/securetransport.py | ||
@@ -19,8 +19,8 @@ | ||
|
||
To use this module, simply import and inject it:: | ||
|
||
- import urllib3.contrib.securetransport | ||
- urllib3.contrib.securetransport.inject_into_urllib3() | ||
+ import urllib3.contrib.securetransport as securetransport | ||
+ securetransport.inject_into_urllib3() | ||
|
||
Happy TLSing! | ||
|
||
diff --git a/src/pip/_vendor/urllib3/contrib/pyopenssl.py b/src/pip/_vendor/urllib3/contrib/pyopenssl.py | ||
index c43146279..4cded53f6 100644 | ||
--- a/src/pip/_vendor/urllib3/contrib/pyopenssl.py | ||
+++ b/src/pip/_vendor/urllib3/contrib/pyopenssl.py | ||
@@ -28,7 +28,7 @@ | ||
.. code-block:: python | ||
|
||
try: | ||
- import urllib3.contrib.pyopenssl | ||
- urllib3.contrib.pyopenssl.inject_into_urllib3() | ||
+ import urllib3.contrib.pyopenssl as pyopenssl | ||
+ pyopenssl.inject_into_urllib3() | ||
except ImportError: | ||
pass |
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