kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2968 from pypa/fix-imports

Browse Source 
Fix imports
This commit is contained in:
Dan Ryan
2018-10-09 14:11:51 -04:00
committed by GitHub
parent 3cc8c6d094 160cb13584
commit 857f1ea5ae
6 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
news/2950.bugfix
+1
View File
@@ -0,0 +1 @@
Fix broken backport imports for vendored vistir.
news/2955.bugfix
+1
View File
@@ -0,0 +1 @@
Fix broken backport imports for vendored vistir.
news/2961.bugfix
+1
View File
@@ -0,0 +1 @@
Fix broken backport imports for vendored vistir.
pipenv/vendor/vistir/backports/tempfile.py
Vendored
+1 -1
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+35
View File
@@ -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"]