gh-69605: Check for already imported modules in PyREPL module completion#139461
Conversation
|
Ok, one of the new test fails on Windows x64/32 (but pass on arm) I just setup and built Python on a Win 11 x64 to try to reproduce, the test pass 😵💫 (and the fix works) |
Sorry, something went wrong.
Sorry, something went wrong.
|
I'm going to convert it into a draft until you deem this PR ready. That will also reduce the probability of someone clicking on the PR to review it (like me...) while it's not yet ready for. |
Sorry, something went wrong.
Thanks, I just fixed the failing test, this should be ready for review! Sorry again for the noise, I was dealing with what turned out to be a importer cache issue, which I couldn't reproduce outside of the CI buildbots 😓 [edit] I just noticed I can convert to draft / mark ready myself, will do it next times! |
Sorry, something went wrong.
…ules' of https://github.com/loic-simon/cpython into pyrepl-module-completion-check-for-already-imported-modules
…ready-imported-modules
There was a problem hiding this comment.
I also realized we will need the same logic for my other PR about attributes completion, so I factored the logic into a private method, I suggest we merge this one first so I can rebase merge main into the other and call it!
EDIT: ok that's not true, since attributes completion checks directly the module object, I forgot 😅 but the refactor is a good thing anyway I think
Sorry, something went wrong.
|
This is good, confirmed on macOS and Windows it's doing the right thing! |
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot s390x RHEL9 LTO + PGO 3.x (tier-3) has failed when building commit bfac54d. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/#/builders/1578/builds/3864 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Click to see traceback logsTraceback (most recent call last):
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto-pgo/build/Lib/test/test_pyrepl/test_pyrepl.py", line 1195, in test_already_imported_module_without_origin_or_spec
module = importlib.import_module(mod)
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto-pgo/build/Lib/importlib/__init__.py", line 88, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<frozen importlib._bootstrap>", line 1303, in _gcd_import
File "<frozen importlib._bootstrap>", line 1276, in _find_and_load
File "<frozen importlib._bootstrap>", line 1240, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'no_spec'
Traceback (most recent call last):
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto-pgo/build/Lib/test/test_pyrepl/test_pyrepl.py", line 1195, in test_already_imported_module_without_origin_or_spec
module = importlib.import_module(mod)
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto-pgo/build/Lib/importlib/__init__.py", line 88, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<frozen importlib._bootstrap>", line 1303, in _gcd_import
File "<frozen importlib._bootstrap>", line 1276, in _find_and_load
File "<frozen importlib._bootstrap>", line 1240, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'not_has_location'
|
Sorry, something went wrong.
|
The buildbot failure is related. I'm on it. |
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot s390x RHEL9 LTO 3.x (tier-3) has failed when building commit bfac54d. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/#/builders/1587/builds/3876 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Click to see traceback logsTraceback (most recent call last):
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto/build/Lib/test/test_pyrepl/test_pyrepl.py", line 1195, in test_already_imported_module_without_origin_or_spec
module = importlib.import_module(mod)
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto/build/Lib/importlib/__init__.py", line 88, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<frozen importlib._bootstrap>", line 1303, in _gcd_import
File "<frozen importlib._bootstrap>", line 1276, in _find_and_load
File "<frozen importlib._bootstrap>", line 1240, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'not_has_location'
Traceback (most recent call last):
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto/build/Lib/test/test_pyrepl/test_pyrepl.py", line 1195, in test_already_imported_module_without_origin_or_spec
module = importlib.import_module(mod)
File "/home/buildbot/buildarea/3.x.cstratak-rhel9-s390x.lto/build/Lib/importlib/__init__.py", line 88, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<frozen importlib._bootstrap>", line 1303, in _gcd_import
File "<frozen importlib._bootstrap>", line 1276, in _find_and_load
File "<frozen importlib._bootstrap>", line 1240, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'no_spec'
|
Sorry, something went wrong.
|
I suspect this is about file system timestamp resolution. Lemme attempt a fix. |
Sorry, something went wrong.
|
@ambv Shall we backport this PR (& and the buildbot fix)? I think this can be considered a bugfix. |
Sorry, something went wrong.
…ompletion (pythonGH-139461) Co-authored-by: Tomas R. <tomas.roun8@gmail.com>
…ompletion (pythonGH-139461) Co-authored-by: Tomas R. <tomas.roun8@gmail.com>
This PR handles an edge-case when suggesting module imports in PyREPL (see this comment):
If a module is already imported, the import machinery will only get submodules from it, even if a module of the same name is higher in the path. This can happen if eg. sys.path has been updated since the module was originaly imported.
The easiest way to reproduce this issue (and how I stumbled on it) is with stdlib modules imported during interpreter startup (before site customisation, so ignoring potential shadowing):
This PR add a special case in
_pyrepl.ModuleCompleter._find_modulesthatIt was a little tricky to get right, I'm not sure about everything 😅 but it pass all tests I could think off!
cc @tomasr8