mirror of https://github.com/pypa/pip
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
diff --git a/pip/_vendor/requests/__init__.py b/pip/_vendor/requests/__init__.py
|
|
index 9c3b769..44f6836 100644
|
|
--- a/pip/_vendor/requests/__init__.py
|
|
+++ b/pip/_vendor/requests/__init__.py
|
|
@@ -48,11 +48,13 @@ __license__ = 'Apache 2.0'
|
|
__copyright__ = 'Copyright 2016 Kenneth Reitz'
|
|
|
|
# Attempt to enable urllib3's SNI support, if possible
|
|
-try:
|
|
- from .packages.urllib3.contrib import pyopenssl
|
|
- pyopenssl.inject_into_urllib3()
|
|
-except ImportError:
|
|
- pass
|
|
+# Note: Patched by pip to prevent using the PyOpenSSL module. On Windows this
|
|
+# prevents upgrading cryptography.
|
|
+# try:
|
|
+# from .packages.urllib3.contrib import pyopenssl
|
|
+# pyopenssl.inject_into_urllib3()
|
|
+# except ImportError:
|
|
+# pass
|
|
|
|
import warnings
|
|
|
|
diff --git a/pip/_vendor/requests/compat.py b/pip/_vendor/requests/compat.py
|
|
index eb6530d..353ec29 100644
|
|
--- a/pip/_vendor/requests/compat.py
|
|
+++ b/pip/_vendor/requests/compat.py
|
|
@@ -25,12 +25,14 @@ is_py2 = (_ver[0] == 2)
|
|
#: Python 3.x?
|
|
is_py3 = (_ver[0] == 3)
|
|
|
|
-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
|
|
+# 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
|