fixtures: inline some functions to streamline the code - #12130
Merged
nicoddemus merged 6 commits intoApr 27, 2024
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
nicoddemus
approved these changes
Apr 27, 2024
nicoddemus
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM!
Sorry, something went wrong.
This stuff is less interesting when reading `_get_active_fixturedef`.
Doesn't add much.
nicoddemus
force-pushed
the
fixtures-inline
branch
from
64da72b to
882c4da
Compare
April 27, 2024 12:48
nicoddemus
enabled auto-merge
April 27, 2024 12:50
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
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.
The getfixturevalue code is split over several functions, but I find it mostly obscures the flow of the logic. This PR inlines _getnextfixturedef and _compute_fixture_value into _get_active_fixturedef which is now a single linear function, mostly. I did move some sanity checking code out of the function since it mostly distracts.