Simplify implementation

Author: loic-simon

Lib/_pyrepl/_module_completer.py

@@ -108,12 +108,18 @@ def _find_modules(self, path: str, prefix: str) -> list[str]:
             if path is None:
                 return []
 
-        modules: Iterable[pkgutil.ModuleInfo]
+        modules: Iterable[pkgutil.ModuleInfo] = self.global_cache
         imported_module = sys.modules.get(path.split('.')[0])
         if imported_module:
-            modules = self._find_already_imported_module_infos(imported_module)
-        else:
-            modules = self.global_cache
+            # Filter modules to those who name and specs match the
+            # imported module to avoid invalid suggestions
+            spec = imported_module.__spec__
+            if spec:
+                modules = [mod for mod in modules
+                           if mod.name == spec.name
+                           and mod.module_finder.find_spec(mod.name) == spec]
+            else:
+                modules = []
 
         is_stdlib_import: bool | None = None
         for segment in path.split('.'):
@@ -136,32 +142,6 @@ def _is_stdlib_module(self, module_info: pkgutil.ModuleInfo) -> bool:
         return (isinstance(module_info.module_finder, FileFinder)
                 and module_info.module_finder.path == self._stdlib_path)
 
-    def _find_already_imported_module_infos(self, imported_module: ModuleType) -> list[pkgutil.ModuleInfo]:
-        # Module already imported: only look in its location,
-        # even if a module with the same name would be higher in path
-        module_location = self._get_module_location(imported_module)
-        if not module_location:
-            # If we cannot find the module source, propose no suggestions
-            return []
-        import_location = os.path.dirname(module_location)
-        return list(pkgutil.iter_modules([import_location]))
-
-    def _get_module_location(self, imported_module: ModuleType) -> str | None:
-        spec = imported_module.__spec__
-        if not spec:
-            return None
-        if not spec.has_location:
-            if spec.origin == "frozen":  # See Tools/build/freeze_modules.py
-                return os.path.join(self._stdlib_path, f"{spec.name}.py")
-            return None
-        if not spec.origin:
-            return None
-        if imported_module.__package__:
-            # Package: the module location is the parent folder
-            return os.path.dirname(spec.origin)
-        else:
-            return spec.origin
-
     def is_suggestion_match(self, module_name: str, prefix: str) -> bool:
         if prefix:
             return module_name.startswith(prefix)

Lib/test/test_pyrepl/test_pyrepl.py

@@ -1133,15 +1133,7 @@ def test_already_imported_stdlib_module_no_other_suggestions(self):
             output = reader.readline()
             self.assertEqual(output, "import collections.abc")
 
-    @patch.dict(sys.modules)
-    def test_already_imported_frozen_module(self):
-        importlib.import_module("__phello__")
-        events = code_to_events("from __phello__ import s\t\n")
-        reader = self.prepare_reader(events, namespace={})
-        output = reader.readline()
-        self.assertEqual(output, "from __phello__ import spam")
-
-    def test_already_imported_custom_module_no_other_suggestions(self):
+    def test_already_imported_custom_module_no_suggestions(self):
         with (tempfile.TemporaryDirectory() as _dir1,
               tempfile.TemporaryDirectory() as _dir2,
               patch.object(sys, "path", [_dir2, _dir1, *sys.path])):
@@ -1158,11 +1150,11 @@ def test_already_imported_custom_module_no_other_suggestions(self):
             # Purge FileFinder cache after adding files
             pkgutil.get_importer(_dir2).invalidate_caches()
             # mymodule found in dir2 before dir1, but it was already imported
-            # from dir1 -> suggest dir1 submodules only
+            # from dir1 -> do not suggest dir2 submodules
             events = code_to_events("import mymodule.\t\n")
             reader = self.prepare_reader(events, namespace={})
             output = reader.readline()
-            self.assertEqual(output, "import mymodule.foo")
+            self.assertEqual(output, "import mymodule.")
 
             del sys.modules["mymodule"]
             # mymodule not imported anymore -> suggest dir2 submodules