mirror of https://github.com/pypa/pip
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
|
|
index 6336a07d..9582fa73 100644
|
|
--- a/src/pip/_vendor/requests/packages.py
|
|
+++ b/src/pip/_vendor/requests/packages.py
|
|
@@ -4,11 +4,13 @@ import sys
|
|
# I don't like it either. Just look the other way. :)
|
|
|
|
for package in ('urllib3', 'idna', 'chardet'):
|
|
- locals()[package] = __import__(package)
|
|
+ vendored_package = "pip._vendor." + package
|
|
+ locals()[package] = __import__(vendored_package)
|
|
# This traversal is apparently necessary such that the identities are
|
|
# preserved (requests.packages.urllib3.* is urllib3.*)
|
|
for mod in list(sys.modules):
|
|
- if mod == package or mod.startswith(package + '.'):
|
|
- sys.modules['requests.packages.' + mod] = sys.modules[mod]
|
|
+ if mod == vendored_package or mod.startswith(vendored_package + '.'):
|
|
+ unprefixed_mod = mod[len("pip._vendor."):]
|
|
+ sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
|
|
|
|
# Kinda cool, though, right?
|
|
|
|
diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
|
|
index dc83261a8..517458b5a 100644
|
|
--- a/src/pip/_vendor/requests/__init__.py
|
|
+++ b/src/pip/_vendor/requests/__init__.py
|
|
@@ -94,6 +94,11 @@ except (AssertionError, ValueError):
|
|
# if the standard library doesn't support SNI or the
|
|
# 'ssl' library isn't available.
|
|
try:
|
|
+ # Note: This logic prevents upgrading cryptography on Windows, if imported
|
|
+ # as part of pip.
|
|
+ from pip._internal.utils.compat import WINDOWS
|
|
+ if not WINDOWS:
|
|
+ raise ImportError("pip internals: don't import cryptography on Windows")
|
|
try:
|
|
import ssl
|
|
except ImportError:
|
|
|
|
diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
|
|
index eb6530d..353ec29 100644
|
|
--- a/src/pip/_vendor/requests/compat.py
|
|
+++ b/src/pip/_vendor/requests/compat.py
|
|
@@ -25,10 +25,14 @@
|
|
#: Python 3.x?
|
|
is_py3 = (_ver[0] == 3)
|
|
|
|
-try:
|
|
- import simplejson as json
|
|
-except ImportError:
|
|
- import json
|
|
+# Note: We've patched out simplejson support in pip because it prevents
|
|
+# upgrading simplejson on Windows.
|
|
+# try:
|
|
+# import simplejson as json
|
|
+# except (ImportError, SyntaxError):
|
|
+# # simplejson does not support Python 3.2, it throws a SyntaxError
|
|
+# # because of u'...' Unicode literals.
|
|
+import json
|
|
|
|
# ---------
|
|
# Specifics
|