fix: Resolved an ImportError crash when using --import-mode=importlib
#13053
+39
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dongfangtianyu
force-pushed
the
hotfix
branch
from
c5a7ed8 to
ddb0306
Compare
psf-chronographer
bot
added
the
bot:chronographer:provided
|
Thanks @valeriupredoi @michael-christen for feedback. |
nicoddemus
reviewed
Dec 12, 2024
nicoddemus
approved these changes
Dec 12, 2024
|
many thanks @dongfangtianyu - I'm sure it does, I took a look at the code, and if @nicoddemus approved then I think it's all spiffy 🍺 |
Backport to 8.3.x: 💚 backport PR created✅ Backport PR branch: Backported as #13054 🤖 @patchback |
patchback bot
pushed a commit
that referenced
this pull request
Dec 12, 2024
Regression in #12716 In short: `PathFinder.find_spec` received the argument `/cow/moo` but loaded `/cow/moo/moo.py` instead. **Trigger conditions:** 1. `/cow/moo/moo.py` exists (a file and directory with the same name). 2. `/cow/moo/test_moo.py` exists (test case resides in the directory). When pytest loads test files in `importlib` mode, it continues recursive loading upward: - When loading `cow.moo`, it should return a namespace but unexpectedly returns a module. - When loading `cow.moo.moo`, it should return a module but unexpectedly returns a namespace. **Complete example:** [[GitHub repository](https://github.com/dongfangtianyu/pytest_importlib_issue)](https://github.com/dongfangtianyu/pytest_importlib_issue) - `main.py`: Reproduces the error. - `debug.py`: Demonstrates the behavior of `PathFinder.find_spec`. **Context:** #12592 (comment) #12592 (comment) --------- Co-authored-by: Bruno Oliveira <[email protected]> (cherry picked from commit 28e1e25)
nicoddemus
pushed a commit
that referenced
this pull request
Dec 12, 2024
…#13054) Regression in #12716 In short: `PathFinder.find_spec` received the argument `/cow/moo` but loaded `/cow/moo/moo.py` instead. **Trigger conditions:** 1. `/cow/moo/moo.py` exists (a file and directory with the same name). 2. `/cow/moo/test_moo.py` exists (test case resides in the directory). When pytest loads test files in `importlib` mode, it continues recursive loading upward: - When loading `cow.moo`, it should return a namespace but unexpectedly returns a module. - When loading `cow.moo.moo`, it should return a module but unexpectedly returns a namespace. **Complete example:** [[GitHub repository](https://github.com/dongfangtianyu/pytest_importlib_issue)](https://github.com/dongfangtianyu/pytest_importlib_issue) - `main.py`: Reproduces the error. - `debug.py`: Demonstrates the behavior of `PathFinder.find_spec`. **Context:** #12592 (comment) #12592 (comment) --------- Co-authored-by: Bruno Oliveira <[email protected]> (cherry picked from commit 28e1e25) Co-authored-by: dongfangtianyu <[email protected]>
Can confirm, this fixed the issue I was experiencing, thanks again, you're the best @dongfangtianyu! |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Regression in #12716
In short:
PathFinder.find_specreceived the argument/cow/moobut loaded/cow/moo/moo.pyinstead.Trigger conditions:
/cow/moo/moo.pyexists (a file and directory with the same name)./cow/moo/test_moo.pyexists (test case resides in the directory).When pytest loads test files in
importlibmode, it continues recursive loading upward:cow.moo, it should return a namespace but unexpectedly returns a module.cow.moo.moo, it should return a module but unexpectedly returns a namespace.Complete example: [GitHub repository](https://github.com/dongfangtianyu/pytest_importlib_issue)
main.py: Reproduces the error.debug.py: Demonstrates the behavior ofPathFinder.find_spec.Context:
#12592 (comment)
#12592 (comment)