Fix bug that caused import errors when flake8 was executed as a stand…

…alone.
atollk · Aug 25, 2023 · 6154605 · 6154605
1 parent 6a9a698
commit 6154605
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 22 deletions.
diff --git a/flake8_import_restrictions/imports_submodule.py b/flake8_import_restrictions/imports_submodule.py
@@ -19,27 +19,32 @@ def imports_submodule(
     :return None, if an error occurs, e.g. the given file is not part of any directory in sys.path. Otherwise,
     a bool is returned that is True if and only if the imported object is a module.
     """
-    if level > 0:
-        try:
-            filename = os.path.dirname(_rel_to_sys_path(filename))
-        except TypeError:
-            return None
-        package = ".".join(filename.split(os.path.sep))
-    else:
-        package = None
-
+    old_sys_path = sys.path
     try:
-        parent = importlib.import_module("." * level + from_, package)
-    except (ImportError, TypeError):
-        return None
-    if not hasattr(parent, import_):
+        sys.path += [os.getcwd()]
+        if level > 0:
+            try:
+                filename = os.path.dirname(_rel_to_sys_path(filename))
+            except TypeError:
+                return None
+            package = ".".join(filename.split(os.path.sep))
+        else:
+            package = None
+
         try:
-            importlib.import_module(
-                "." * level + from_ + "." + import_, package
-            )
-        except ImportError:
-            return False
-    return isinstance(getattr(parent, import_), types.ModuleType)
+            parent = importlib.import_module("." * level + from_, package)
+        except (ImportError, TypeError):
+            return None
+        if not hasattr(parent, import_):
+            try:
+                importlib.import_module(
+                    "." * level + from_ + "." + import_, package
+                )
+            except ImportError:
+                return False
+        return isinstance(getattr(parent, import_), types.ModuleType)
+    finally:
+        sys.path = old_sys_path
 
 
 def _rel_to_sys_path(path: str) -> str:

diff --git a/tests/test_imports_submodule.py b/tests/test_imports_submodule.py
@@ -14,6 +14,7 @@ def test_absolute_1():
 
 
 def test_absolute_2():
+    assert imports_submodule(FILE1, 0, "tests.resources", "a")
     assert imports_submodule(FILE1, 0, "tests.resources", "b")
     assert not imports_submodule(FILE1, 0, "tests.resources.b", "B")
     assert not imports_submodule(FILE1, 0, "tests.resources.b", "C")

diff --git a/tests/test_i2000.py → tests/test_imr200.py b/tests/test_i2000.py → tests/test_imr200.py
diff --git a/tests/test_i2001.py → tests/test_imr201.py b/tests/test_i2001.py → tests/test_imr201.py
diff --git a/tests/test_i2002.py → tests/test_imr202.py b/tests/test_i2002.py → tests/test_imr202.py
diff --git a/tests/test_i2020.py → tests/test_imr220.py b/tests/test_i2020.py → tests/test_imr220.py
diff --git a/tests/test_i2021.py → tests/test_imr221.py b/tests/test_i2021.py → tests/test_imr221.py
diff --git a/tests/test_i2022.py → tests/test_imr222.py b/tests/test_i2022.py → tests/test_imr222.py
diff --git a/tests/test_i2023.py → tests/test_imr223.py b/tests/test_i2023.py → tests/test_imr223.py
diff --git a/tests/test_i2040.py → tests/test_imr240.py b/tests/test_i2040.py → tests/test_imr240.py
diff --git a/tests/test_i2041.py → tests/test_imr241.py b/tests/test_i2041.py → tests/test_imr241.py
@@ -33,3 +33,17 @@ def test_fail_2(self):
         """
         result = self.run_flake8(code)
         self.assert_error_at(result, "IMR241", 2, 1)
+
+    def test_issue_14(self):
+        main_code = """
+        from test.test2 import testmodule
+        from test import test2
+        """
+        files = {
+            "main.py": main_code,
+            "test/__init__.py": "",
+            "test/test2/__init__.py": "",
+            "test/test2/testmodule.py": "",
+        }
+        result = self.run_flake8_multifile(files)
+        assert result == []
diff --git a/tests/test_i2042.py → tests/test_imr242.py b/tests/test_i2042.py → tests/test_imr242.py
diff --git a/tests/test_i2043.py → tests/test_imr243.py b/tests/test_i2043.py → tests/test_imr243.py
diff --git a/tests/test_i2044.py → tests/test_imr244.py b/tests/test_i2044.py → tests/test_imr244.py
diff --git a/tests/test_i2045.py → tests/test_imr245.py b/tests/test_i2045.py → tests/test_imr245.py
diff --git a/tests/util.py b/tests/util.py
@@ -2,8 +2,8 @@
 import dataclasses
 import re
 import textwrap
-from typing import List
-
+from typing import List, Dict
+import pytest_flake8_path
 import pytest
 
 
@@ -27,9 +27,22 @@ def error_code(self) -> str:
         raise NotImplementedError
 
     @pytest.fixture(autouse=True)
-    def _flake8dir(self, flake8_path):
+    def _flake8dir(self, flake8_path: pytest_flake8_path.Flake8Path):
         self.flake8_path = flake8_path
 
+    def run_flake8_multifile(self, files: Dict[str, str]):
+        for fname, code in files.items():
+            (self.flake8_path / fname).parent.mkdir(parents=True, exist_ok=True)
+            (self.flake8_path / fname).write_text(textwrap.dedent(code))
+        args = [f"--{self.error_code().lower()}_include=*", "--select=IMR"]
+        result = self.flake8_path.run_flake8(args)
+        reports = [
+            ReportedMessage.from_raw(report) for report in result.out_lines
+        ]
+        return [
+            report for report in reports if report.code == self.error_code()
+        ]
+
     def run_flake8(self, code: str) -> List[ReportedMessage]:
         (self.flake8_path / "example.py").write_text(textwrap.dedent(code))
         args = [f"--{self.error_code().lower()}_include=*", "--select=IMR"]