PyREPL module autocomplete: do not fallback

When no module completions are available, do not fallback to completions from current namespace

Author: loic-simon

Lib/_pyrepl/_module_completer.py

@@ -42,11 +42,14 @@ def __init__(self, namespace: Mapping[str, Any] | None = None) -> None:
         self._global_cache: list[pkgutil.ModuleInfo] = []
         self._curr_sys_path: list[str] = sys.path[:]
 
-    def get_completions(self, line: str) -> list[str]:
-        """Return the next possible import completions for 'line'."""
+    def get_completions(self, line: str) -> list[str] | None:
+        """Return the next possible import completions for 'line'.
+
+        If 'line' is not an import statement, return None.
+        """
         result = ImportParser(line).parse()
         if not result:
-            return []
+            return None
         try:
             return self.complete(*result)
         except Exception:

Lib/_pyrepl/readline.py

@@ -134,7 +134,7 @@ def get_stem(self) -> str:
         return "".join(b[p + 1 : self.pos])
 
     def get_completions(self, stem: str) -> list[str]:
-        if module_completions := self.get_module_completions():
+        if (module_completions := self.get_module_completions()) is not None:
             return module_completions
         if len(stem) == 0 and self.more_lines is not None:
             b = self.buffer
@@ -165,7 +165,7 @@ def get_completions(self, stem: str) -> list[str]:
             result.sort()
         return result
 
-    def get_module_completions(self) -> list[str]:
+    def get_module_completions(self) -> list[str] | None:
         line = self.get_line()
         return self.config.module_completer.get_completions(line)
 

Lib/test/test_pyrepl/test_pyrepl.py

@@ -944,13 +944,16 @@ def test_import_completions(self):
             ("import importlib.resources.\t\ta\t\n", "import importlib.resources.abc"),
             ("import foo, impo\t\n", "import foo, importlib"),
             ("import foo as bar, impo\t\n", "import foo as bar, importlib"),
+            ("import pri\t\n", "import pri"),  # do not complete with "print("
             ("from impo\t\n", "from importlib"),
+            ("from pri\t\n", "from pri"),
             ("from importlib.res\t\n", "from importlib.resources"),
             ("from importlib.\t\tres\t\n", "from importlib.resources"),
             ("from importlib.resources.ab\t\n", "from importlib.resources.abc"),
             ("from importlib import mac\t\n", "from importlib import machinery"),
             ("from importlib import res\t\n", "from importlib import resources"),
             ("from importlib.res\t import a\t\n", "from importlib.resources import abc"),
+            ("from typing import Na\t\n", "from typing import Na"),  # do not complete with "NameError("
         )
         for code, expected in cases:
             with self.subTest(code=code):