Also use Python 2 sys.path to find files

python · JukkaL · Nov 15, 2019 · Nov 5, 2019 · Nov 5, 2019 · Nov 5, 2019
commit 67e2db455b46e7c28205b1af67d68a1b3f0ebe0d
diff --git a/mypy/stubutil.py b/mypy/stubutil.py
@@ -90,7 +90,10 @@ def find_module_path_and_all_py2(module: str,
     try:
         output_bytes = subprocess.check_output(cmd_template % code, shell=True)
     except subprocess.CalledProcessError as e:
-        raise CantImport(module, str(e))
+        path = find_module_path_using_py2_sys_path(module, interpreter)
+        if path is None:
+            raise CantImport(module, str(e))
+        return path, None
     output = output_bytes.decode('ascii').strip().splitlines()
     module_path = output[0]
     if not module_path.endswith(('.py', '.pyc', '.pyo')):
@@ -102,6 +105,32 @@ def find_module_path_and_all_py2(module: str,
     return module_path, module_all
 
 
+def find_module_path_using_py2_sys_path(module: str,
+                                        interpreter: str) -> Optional[str]:
+    """Try to find the path of a .py file for a module using Python 2 sys.path.
+
+    Return None if no match was found.
+    """
+    out = subprocess.run([interpreter, '-c', 'import sys; import json; print(json.dumps(sys.path))'],
+                         check=True,
+                         stdout=subprocess.PIPE).stdout
+    sys_path = json.loads(out)
+    return find_module_path_using_sys_path(module, sys_path)
+
+
+def find_module_path_using_sys_path(module: str, sys_path: List[str]) -> Optional[str]:
+    relative_candidates = (
+        module.replace('.', '/') + '.py',
+        os.path.join(module.replace('.', '/'), '__init__.py')
+    )
+    for base in sys_path:
+        for relative_path in relative_candidates:
+            path = os.path.join(base, relative_path)
+            if os.path.isfile(path):
+                return path
+    return None
+
+
 def find_module_path_and_all_py3(inspect: ModuleInspect,
                                  module: str,
                                  verbose: bool) -> Optional[Tuple[Optional[str],
@@ -121,7 +150,7 @@ def find_module_path_and_all_py3(inspect: ModuleInspect,
         mod = inspect.get_package_properties(module)
     except InspectError as e:
         # Fall back to finding the module using sys.path.
-        path = find_module_path_using_sys_path(module)
+        path = find_module_path_using_sys_path(module, sys.path)
         if path is None:
             raise CantImport(module, str(e))
         return path, None
@@ -130,23 +159,6 @@ def find_module_path_and_all_py3(inspect: ModuleInspect,
     return mod.file, mod.all
 
 
-def find_module_path_using_sys_path(module: str) -> Optional[str]:
-    """Try to find the path of a .py file for a module using sys.path.
-
-    Return None if no match was found.
-    """
-    relative_candidates = (
-        module.replace('.', '/') + '.py',
-        os.path.join(module.replace('.', '/'), '__init__.py')
-    )
-    for base in sys.path:
-        for relative_path in relative_candidates:
-            path = os.path.join(base, relative_path)
-            if os.path.isfile(path):
-                return path
-    return None
-
-
 @contextmanager
 def generate_guarded(mod: str, target: str,
                      ignore_errors: bool = True, verbose: bool = False) -> Iterator[None]: