From b57d0ddcf12d1b9bb9e4014acff81b916a07be87 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 9 Oct 2018 12:14:26 -0400 Subject: [PATCH] Update vistir imports Signed-off-by: Dan Ryan --- pipenv/vendor/vistir/compat.py | 4 ++-- .../patches/vendor/vistir-imports.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tasks/vendoring/patches/vendor/vistir-imports.patch diff --git a/pipenv/vendor/vistir/compat.py b/pipenv/vendor/vistir/compat.py index 1f1b7a96..0c865fe6 100644 --- a/pipenv/vendor/vistir/compat.py +++ b/pipenv/vendor/vistir/compat.py @@ -30,7 +30,7 @@ else: from pathlib2 import Path if sys.version_info < (3, 3): - from backports.shutil_get_terminal_size import get_terminal_size + from pipenv.vendor.backports.shutil_get_terminal_size import get_terminal_size from .backports.tempfile import NamedTemporaryFile else: from tempfile import NamedTemporaryFile @@ -39,7 +39,7 @@ else: try: from weakref import finalize except ImportError: - from backports.weakref import finalize + from pipenv.vendor.backports.weakref import finalize try: from functools import partialmethod diff --git a/tasks/vendoring/patches/vendor/vistir-imports.patch b/tasks/vendoring/patches/vendor/vistir-imports.patch new file mode 100644 index 00000000..68b14da0 --- /dev/null +++ b/tasks/vendoring/patches/vendor/vistir-imports.patch @@ -0,0 +1,22 @@ +diff --git a/pipenv/vendor/vistir/compat.py b/pipenv/vendor/vistir/compat.py +index 1f1b7a96..0c865fe6 100644 +--- a/pipenv/vendor/vistir/compat.py ++++ b/pipenv/vendor/vistir/compat.py +@@ -30,7 +30,7 @@ else: + from pathlib2 import Path + + if sys.version_info < (3, 3): +- from backports.shutil_get_terminal_size import get_terminal_size ++ from pipenv.vendor.backports.shutil_get_terminal_size import get_terminal_size + from .backports.tempfile import NamedTemporaryFile + else: + from tempfile import NamedTemporaryFile +@@ -39,7 +39,7 @@ else: + try: + from weakref import finalize + except ImportError: +- from backports.weakref import finalize ++ from pipenv.vendor.backports.weakref import finalize + + try: + from functools import partialmethod