43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
pip/_vendor/__init__.py | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
|
|
index b09a7c3..b9fe6ee 100644
|
|
--- a/pip/_vendor/__init__.py
|
|
+++ b/pip/_vendor/__init__.py
|
|
@@ -14,7 +14,7 @@ import sys
|
|
# Downstream redistributors which have debundled our dependencies should also
|
|
# patch this value to be true. This will trigger the additional patching
|
|
# to cause things like "six" to be available as pip.
|
|
-DEBUNDLED = False
|
|
+DEBUNDLED = True
|
|
|
|
# By default, look in this directory for a bunch of .whl files which we will
|
|
# add to the beginning of sys.path before attempting to import anything. This
|
|
@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
|
|
def vendored(modulename):
|
|
vendored_name = "{0}.{1}".format(__name__, modulename)
|
|
|
|
- try:
|
|
- __import__(vendored_name, globals(), locals(), level=0)
|
|
- except ImportError:
|
|
- __import__(modulename, globals(), locals(), level=0)
|
|
- sys.modules[vendored_name] = sys.modules[modulename]
|
|
- base, head = vendored_name.rsplit(".", 1)
|
|
- setattr(sys.modules[base], head, sys.modules[modulename])
|
|
+ __import__(modulename, globals(), locals(), level=0)
|
|
+ sys.modules[vendored_name] = sys.modules[modulename]
|
|
+ base, head = vendored_name.rsplit(".", 1)
|
|
+ setattr(sys.modules[base], head, sys.modules[modulename])
|
|
|
|
|
|
# If we're operating in a debundled setup, then we want to go ahead and trigger
|
|
@@ -85,8 +82,6 @@ if DEBUNDLED:
|
|
vendored("requests.packages.urllib3.packages.ordered_dict")
|
|
vendored("requests.packages.urllib3.packages.six")
|
|
vendored("requests.packages.urllib3.packages.ssl_match_hostname")
|
|
- vendored("requests.packages.urllib3.packages.ssl_match_hostname."
|
|
- "_implementation")
|
|
vendored("requests.packages.urllib3.poolmanager")
|
|
vendored("requests.packages.urllib3.request")
|
|
vendored("requests.packages.urllib3.response")
|