mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Merge branch 'release/9.0.3' into merged/9.0.3
This commit is contained in:
commit
4c16e71cdd
3 changed files with 24 additions and 6 deletions
8
NEWS.rst
8
NEWS.rst
|
@ -8,6 +8,14 @@
|
||||||
.. towncrier release notes start
|
.. towncrier release notes start
|
||||||
|
|
||||||
|
|
||||||
|
9.0.3 (2018-03-21)
|
||||||
|
==================
|
||||||
|
|
||||||
|
- Fix an error where the vendored requests was not correctly containing itself
|
||||||
|
to only the internal vendored prefix.
|
||||||
|
- Restore compatability with 2.6.
|
||||||
|
|
||||||
|
|
||||||
9.0.2 (2018-03-16)
|
9.0.2 (2018-03-16)
|
||||||
==================
|
==================
|
||||||
|
|
||||||
|
|
|
@ -4,11 +4,13 @@ import sys
|
||||||
# I don't like it either. Just look the other way. :)
|
# I don't like it either. Just look the other way. :)
|
||||||
|
|
||||||
for package in ('urllib3', 'idna', 'chardet'):
|
for package in ('urllib3', 'idna', 'chardet'):
|
||||||
locals()[package] = __import__("pip._vendor." + package)
|
vendored_package = "pip._vendor." + package
|
||||||
|
locals()[package] = __import__(vendored_package)
|
||||||
# This traversal is apparently necessary such that the identities are
|
# This traversal is apparently necessary such that the identities are
|
||||||
# preserved (requests.packages.urllib3.* is urllib3.*)
|
# preserved (requests.packages.urllib3.* is urllib3.*)
|
||||||
for mod in list(sys.modules):
|
for mod in list(sys.modules):
|
||||||
if mod == package or mod.startswith(package + '.'):
|
if mod == vendored_package or mod.startswith(vendored_package + '.'):
|
||||||
sys.modules['requests.packages.' + mod] = sys.modules[mod]
|
unprefixed_mod = mod[len("pip._vendor."):]
|
||||||
|
sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
|
||||||
|
|
||||||
# Kinda cool, though, right?
|
# Kinda cool, though, right?
|
||||||
|
|
|
@ -1,16 +1,24 @@
|
||||||
diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
|
diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
|
||||||
index 7232fe0f..6336a07d 100644
|
index 6336a07d..9582fa73 100644
|
||||||
--- a/src/pip/_vendor/requests/packages.py
|
--- a/src/pip/_vendor/requests/packages.py
|
||||||
+++ b/src/pip/_vendor/requests/packages.py
|
+++ b/src/pip/_vendor/requests/packages.py
|
||||||
@@ -4,7 +4,7 @@ import sys
|
@@ -4,11 +4,13 @@ import sys
|
||||||
# I don't like it either. Just look the other way. :)
|
# I don't like it either. Just look the other way. :)
|
||||||
|
|
||||||
for package in ('urllib3', 'idna', 'chardet'):
|
for package in ('urllib3', 'idna', 'chardet'):
|
||||||
- locals()[package] = __import__(package)
|
- locals()[package] = __import__(package)
|
||||||
+ locals()[package] = __import__("pip._vendor." + package)
|
+ vendored_package = "pip._vendor." + package
|
||||||
|
+ locals()[package] = __import__(vendored_package)
|
||||||
# This traversal is apparently necessary such that the identities are
|
# This traversal is apparently necessary such that the identities are
|
||||||
# preserved (requests.packages.urllib3.* is urllib3.*)
|
# preserved (requests.packages.urllib3.* is urllib3.*)
|
||||||
for mod in list(sys.modules):
|
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
|
diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
|
||||||
index 9c3b769..44f6836 100644
|
index 9c3b769..44f6836 100644
|
||||||
|
|
Loading…
Reference in a new issue