Update scandir to avoid importing from system lib

- Update lockfile with py2 deps Signed-off-by: Dan Ryan <dan@danryan.co>
pypa · Jun 16, 2018 · 2caa9d7 · 2caa9d7
1 parent 69ace95
commit 2caa9d7
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 4 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pipenv/vendor/scandir.py b/pipenv/vendor/scandir.py
@@ -26,10 +26,7 @@
 import os
 import sys
 
-try:
-    import _scandir
-except ImportError:
-    _scandir = None
+_scandir = None
 
 try:
     import ctypes

diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py
@@ -343,6 +343,21 @@ def vendor(ctx, vendor_dir, rewrite=True):
             remove_all(msgpack.glob('*.so'))
 
 
+@invoke.task
+def redo_imports(ctx, library):
+    vendor_dir = _get_vendor_dir(ctx)
+    log('Using vendor dir: %s' % vendor_dir)
+    vendored_libs = detect_vendored_libs(vendor_dir)
+    item = vendor_dir / library
+    library_name = vendor_dir / '{0}.py'.format(library)
+    log("Detected vendored libraries: %s" % ", ".join(vendored_libs))
+    log('Rewriting imports for %s...' % item)
+    if item.is_dir():
+        rewrite_imports(item, vendored_libs, vendor_dir)
+    else:
+        rewrite_file_imports(library_name, vendored_libs, vendor_dir)
+
+
 @invoke.task
 def rewrite_all_imports(ctx):
     vendor_dir = _get_vendor_dir(ctx)

diff --git a/tasks/vendoring/patches/vendor/drop_scandir_import.patch b/tasks/vendoring/patches/vendor/drop_scandir_import.patch
@@ -0,0 +1,16 @@
+diff --git a/pipenv/vendor/scandir.py b/pipenv/vendor/scandir.py
+index 2e47a397..2b2ade30 100644
+--- a/pipenv/vendor/scandir.py
++++ b/pipenv/vendor/scandir.py
+@@ -26,10 +26,7 @@ import collections
+ import os
+ import sys
+
+-try:
+-    import _scandir
+-except ImportError:
+-    _scandir = None
++_scandir = None
+
+ try:
+     import ctypes