8000 gh-69605: Disable PyREPL module autocomplete fallback on regular completion by loic-simon · Pull Request #134181 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-69605: Disable PyREPL module autocomplete fallback on regular completion #134181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 25, 2025
Merged

gh-69605: Disable PyREPL module autocomplete fallback on regular completion #134181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8978e95
PyREPL module autocomplete: do not fallback
May 18, 2025
ccfdf43
📜🤖 Added by blurb_it.
blurb-it[bot] May 18, 2025
377c761
Improve blurb wording
May 19, 2025
99e1980
Get rid of assignment expression
May 19, 2025
dd5940e
Move tests to a dedicated method
May 19, 2025
84c4f76
Tests: mock sys.path in setUp instead
May 20, 2025
719875e
Remove extra docstring line
May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
PyREPL module autocomplete: do not fallback 
When no module completions are available, do not fallback to completions from current namespace
  • Loading branch information
Loïc Simon committed May 18, 2025
commit 8978e9595c0cd6d99839a8b1bc3eb4ddc56b4327
9 changes: 6 additions & 3 deletions Lib/_pyrepl/_module_completer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Lib/_pyrepl/readline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions Lib/test/test_pyrepl/test_pyrepl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading
0