fixtures: replace PseudoFixtureDef with RequestFixtureDef which is a real FixtureDef #13801
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
This TypeVar represents the return value of the fixture function, so should be covariant.
…real FixtureDef Remove some special cases from the code, and make the types more regular.
bluetech
commented
Oct 8, 2025
| requested_fixturedef: FixtureDef[object], | ||
| requested_scope: Scope, | ||
| ) -> None: | ||
| if isinstance(requested_fixturedef, PseudoFixtureDef): |
There was a problem hiding this comment.
Not needed, request always has Function scope so will never fail this check.
bluetech
commented
Oct 8, 2025
| # down first. This is generally handled by SetupState, but still currently | ||
| # needed when this fixture is not parametrized but depends on a parametrized | ||
| # fixture. | ||
| if not isinstance(fixturedef, PseudoFixtureDef): |
There was a problem hiding this comment.
To remove this special case, I made RequestFixtureDef just ignore addfinalizer calls.
nicoddemus
approved these changes
Oct 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The first commit is a prerequisite typing fix.
The second commit is as the title says. Removes some special cases from the code, and makes the types more regular. Also avoids confusion with a different concept of "pseudo fixturedef" in python.py, which used to really confuse me.