Fix broken imports

- Add tempfile patch and news - Fixes #2950 - Fixes #2955 - Fixes #2961 - Closes #2967 Signed-off-by: Dan Ryan <dan@danryan.co>
pypa · Oct 9, 2018 · 160cb13 · 160cb13
1 parent b57d0dd
commit 160cb13
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/news/2950.bugfix b/news/2950.bugfix
@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.
diff --git a/news/2955.bugfix b/news/2955.bugfix
@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.
diff --git a/news/2961.bugfix b/news/2961.bugfix
@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.
diff --git a/pipenv/vendor/vistir/backports/tempfile.py b/pipenv/vendor/vistir/backports/tempfile.py
@@ -13,7 +13,7 @@
 try:
     from weakref import finalize
 except ImportError:
-    from backports.weakref import finalize
+    from pipenv.vendor.backports.weakref import finalize
 
 
 __all__ = ["finalize", "NamedTemporaryFile"]

diff --git a/tasks/vendoring/patches/vendor/vistir-imports.patch b/tasks/vendoring/patches/vendor/vistir-imports.patch
@@ -20,3 +20,16 @@ index 1f1b7a96..0c865fe6 100644
 
  try:
      from functools import partialmethod
+diff --git a/pipenv/vendor/vistir/backports/tempfile.py b/pipenv/vendor/vistir/backports/tempfile.py
+index 483a479a..43470a6e 100644
+--- a/pipenv/vendor/vistir/backports/tempfile.py
++++ b/pipenv/vendor/vistir/backports/tempfile.py
+@@ -13,7 +13,7 @@ import six
+ try:
+     from weakref import finalize
+ except ImportError:
+-    from backports.weakref import finalize
++    from pipenv.vendor.backports.weakref import finalize
+
+
+ __all__ = ["finalize", "NamedTemporaryFile"]