Skip to content
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

Changed importError to ModuleNotFoundError #12220

Merged
merged 14 commits into from
Apr 26, 2024
Merged

Changed importError to ModuleNotFoundError #12220

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3a26211
Changed importError to ModuleNotFoundError
shekhuverma Apr 16, 2024
3f80fd7
Merge branch 'pytest-dev:main' into main
shekhuverma Apr 19, 2024
fd288e1
added testing for importorskip
shekhuverma Apr 19, 2024
1fe14e0
Merge branch 'importorskip-ModuleNotFoundError'
shekhuverma Apr 19, 2024
543262c
added exc_types parameter in importorskip
shekhuverma Apr 19, 2024
1456b71
Merge branch 'importorskip-ModuleNotFoundError'
shekhuverma Apr 19, 2024
9a9643d
Added warning and Test Cases
shekhuverma Apr 20, 2024
3ca5036
Merge branch 'importorskip-ModuleNotFoundError'
shekhuverma Apr 20, 2024
7de869d
Improve tests and docs
nicoddemus Apr 20, 2024
3ca329b
Improve deprecation docs
nicoddemus Apr 20, 2024
f14d78d
Change exc_type to kw only
nicoddemus Apr 20, 2024
b59336a
Apply suggestions from code review
nicoddemus Apr 25, 2024
76fd0e5
Fix check
nicoddemus Apr 25, 2024
a55abeb
Merge branch 'pytest-dev:main' into main
shekhuverma Apr 26, 2024
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
2 changes: 1 addition & 1 deletion src/_pytest/outcomes.py
View file
Original file line number Diff line number Diff line change
@@ -225,7 +225,7 @@
warnings.simplefilter("ignore")
try:
__import__(modname)
except ImportError as exc:
except ModuleNotFoundError as exc:

Check warning on line 228 in src/_pytest/outcomes.py

Codecov / codecov/patch

src/_pytest/outcomes.py#L228 

Added line #L228 was not covered by tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a new parameter to this function, *, exc_type: Type[ImportError] = ModuleNotFoundError and use it here:

Suggested change
except ModuleNotFoundError as exc:
except exc_type as exc:

This way we provide a escape hatch to users which rely on the old behavior.

Also please update the docs, describing the parameters and explicitly showing an example for users that want the old behavior.

if reason is None:
reason = f"could not import {modname!r}: {exc}"
raise Skipped(reason, allow_module_level=True) from None