diff --git a/pipenv/patched/notpip/_vendor/requests/packages.py b/pipenv/patched/notpip/_vendor/requests/packages.py index 9582fa73..928d1bb9 100644 --- a/pipenv/patched/notpip/_vendor/requests/packages.py +++ b/pipenv/patched/notpip/_vendor/requests/packages.py @@ -4,13 +4,13 @@ import sys # I don't like it either. Just look the other way. :) for package in ('urllib3', 'idna', 'chardet'): - vendored_package = "pip._vendor." + package + vendored_package = "pip9._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 == vendored_package or mod.startswith(vendored_package + '.'): - unprefixed_mod = mod[len("pip._vendor."):] - sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod] + unprefixed_mod = mod[len("pip9._vendor."):] + sys.modules['pip9._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod] # Kinda cool, though, right? diff --git a/tasks/vendoring/patches/patched/_post-pip-update-requests-imports.patch b/tasks/vendoring/patches/patched/_post-pip-update-requests-imports.patch new file mode 100644 index 00000000..bdccfd6d --- /dev/null +++ b/tasks/vendoring/patches/patched/_post-pip-update-requests-imports.patch @@ -0,0 +1,21 @@ +diff --git a/pipenv/patched/notpip/_vendor/requests/packages.py b/pipenv/patched/notpip/_vendor/requests/packages.py +index 9582fa7..928d1bb 100644 +--- a/pipenv/patched/notpip/_vendor/requests/packages.py ++++ b/pipenv/patched/notpip/_vendor/requests/packages.py +@@ -4,13 +4,13 @@ import sys + # I don't like it either. Just look the other way. :) + + for package in ('urllib3', 'idna', 'chardet'): +- vendored_package = "pip._vendor." + package ++ vendored_package = "pip9._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 == vendored_package or mod.startswith(vendored_package + '.'): +- unprefixed_mod = mod[len("pip._vendor."):] +- sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod] ++ unprefixed_mod = mod[len("pip9._vendor."):] ++ sys.modules['pip9._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod] + + # Kinda cool, though, right?