From 8fa2a9e69f41f84b57624a0447d0be379f7ff9c2 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Mon, 23 Apr 2018 18:19:19 -0400 Subject: [PATCH] Update `requests.packages` import path Signed-off-by: Dan Ryan --- pipenv/__version__.py | 2 +- pipenv/vendor/pip9/_vendor/requests/packages.py | 2 +- .../patches/vendor/pip-requests-packages.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tasks/vendoring/patches/vendor/pip-requests-packages.patch diff --git a/pipenv/__version__.py b/pipenv/__version__.py index 511f12fa..7235f7b4 100644 --- a/pipenv/__version__.py +++ b/pipenv/__version__.py @@ -2,4 +2,4 @@ # // ) ) / / // ) ) //___) ) // ) ) || / / # //___/ / / / //___/ / // // / / || / / # // / / // ((____ // / / ||/ / -__version__ = '11.10.1.dev2' +__version__ = '11.10.1.dev3' diff --git a/pipenv/vendor/pip9/_vendor/requests/packages.py b/pipenv/vendor/pip9/_vendor/requests/packages.py index 9582fa73..3aca6f7f 100644 --- a/pipenv/vendor/pip9/_vendor/requests/packages.py +++ b/pipenv/vendor/pip9/_vendor/requests/packages.py @@ -4,7 +4,7 @@ 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.*) diff --git a/tasks/vendoring/patches/vendor/pip-requests-packages.patch b/tasks/vendoring/patches/vendor/pip-requests-packages.patch new file mode 100644 index 00000000..fb20a680 --- /dev/null +++ b/tasks/vendoring/patches/vendor/pip-requests-packages.patch @@ -0,0 +1,13 @@ +diff --git a/pipenv/vendor/pip9/_vendor/requests/packages.py b/pipenv/vendor/pip9/_vendor/requests/packages.py +index 9582fa7..3aca6f7 100644 +--- a/pipenv/vendor/pip9/_vendor/requests/packages.py ++++ b/pipenv/vendor/pip9/_vendor/requests/packages.py +@@ -4,7 +4,7 @@ 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.*)