From 160cb13584aabb7722126258b982086f9bcdd770 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 9 Oct 2018 12:23:54 -0400 Subject: [PATCH] Fix broken imports - Add tempfile patch and news - Fixes #2950 - Fixes #2955 - Fixes #2961 - Closes #2967 Signed-off-by: Dan Ryan --- news/2950.bugfix | 1 + news/2955.bugfix | 1 + news/2961.bugfix | 1 + pipenv/vendor/vistir/backports/tempfile.py | 2 +- tasks/vendoring/patches/vendor/vistir-imports.patch | 13 +++++++++++++ 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 news/2950.bugfix create mode 100644 news/2955.bugfix create mode 100644 news/2961.bugfix diff --git a/news/2950.bugfix b/news/2950.bugfix new file mode 100644 index 0000000000..ac6fcb6ab3 --- /dev/null +++ b/news/2950.bugfix @@ -0,0 +1 @@ +Fix broken backport imports for vendored vistir. diff --git a/news/2955.bugfix b/news/2955.bugfix new file mode 100644 index 0000000000..ac6fcb6ab3 --- /dev/null +++ b/news/2955.bugfix @@ -0,0 +1 @@ +Fix broken backport imports for vendored vistir. diff --git a/news/2961.bugfix b/news/2961.bugfix new file mode 100644 index 0000000000..ac6fcb6ab3 --- /dev/null +++ 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 index 483a479a71..43470a6ee9 100644 --- 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 index 68b14da0ba..f93e79594b 100644 --- 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"]