From 6c8ad874809d930f43595bfbec0adefba29b0dff Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sun, 7 Oct 2018 01:05:10 -0400 Subject: [PATCH] Update pip_shims self-import module replacement logic with new names Signed-off-by: Dan Ryan --- pipenv/vendor/pip_shims/__init__.py | 4 ++-- .../patches/vendor/pip_shims_module_names.patch | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 tasks/vendoring/patches/vendor/pip_shims_module_names.patch diff --git a/pipenv/vendor/pip_shims/__init__.py b/pipenv/vendor/pip_shims/__init__.py index 1342f793..70fb0d58 100644 --- a/pipenv/vendor/pip_shims/__init__.py +++ b/pipenv/vendor/pip_shims/__init__.py @@ -8,10 +8,10 @@ __version__ = '0.3.1' from . import shims -old_module = sys.modules["pip_shims"] +old_module = sys.modules[__name__] -module = sys.modules["pip_shims"] = shims._new() +module = sys.modules[__name__] = shims._new() module.shims = shims module.__dict__.update({ '__file__': __file__, diff --git a/tasks/vendoring/patches/vendor/pip_shims_module_names.patch b/tasks/vendoring/patches/vendor/pip_shims_module_names.patch new file mode 100644 index 00000000..8658dcaa --- /dev/null +++ b/tasks/vendoring/patches/vendor/pip_shims_module_names.patch @@ -0,0 +1,17 @@ +diff --git a/pipenv/vendor/pip_shims/__init__.py b/pipenv/vendor/pip_shims/__init__.py +index 1342f793..70fb0d58 100644 +--- a/pipenv/vendor/pip_shims/__init__.py ++++ b/pipenv/vendor/pip_shims/__init__.py +@@ -8,10 +8,10 @@ __version__ = '0.3.1' + from . import shims + + +-old_module = sys.modules["pip_shims"] ++old_module = sys.modules[__name__] + + +-module = sys.modules["pip_shims"] = shims._new() ++module = sys.modules[__name__] = shims._new() + module.shims = shims + module.__dict__.update({ + '__file__': __file__,