Merge branch 'master' into master

news/2950.bugfix

@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.

news/2955.bugfix

@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.

news/2961.bugfix

@@ -0,0 +1 @@
+Fix broken backport imports for vendored vistir.

pipenv/patched/crayons.py

@@ -39,6 +39,7 @@ if (
     os.environ.get("CMDER_ROOT")
     or os.environ.get("VSCODE_PID")
     or os.environ.get("TERM_PROGRAM") == "Hyper"
+    or "VSCODE_CWD" in os.environ
 ):
     is_native_powershell = False
 else:

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"]

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

tasks/vendoring/patches/vendor/vistir-imports.patch

@@ -0,0 +1,35 @@
+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/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"]