-
Notifications
You must be signed in to change notification settings - Fork 575
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.
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
prevent tuple
subclasses from being interpreted as generic
#3768
Merged
Merged
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c237600
prevent namedtuples from being interpreted as sequences
tybug 65fec1d
use typing alias to support pthon 3.8
tybug 8a5bfca
reject all subclasses of tuple as generic
tybug eec6a07
update release note
tybug f523db1
reformat
tybug fc15290
fix release notes wording
tybug 4a65e5a
add test for a generic protocol whose only concrete subtypes are tuples
tybug e398b28
Merge branch 'namedtuple-generic' of https://github.com/tybug/hypothe…
tybug 7c7375c
move tuple subclass test to py39
tybug 0d0ff88
Merge branch 'master' into namedtuple-generic
Zac-HD File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
RELEASE_TYPE: patch | ||
|
||
This patch improves `st.register_type_strategy` when used with `namedtuple`, by preventing namedtuples from being interpreted as a sequence and provided to strategies like `st.from_type(Sequence[int])`. |
This file contains 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 file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure where this should appear in the function order-wise. There's a portion lower down where
mapping
is iterated over in the same way - maybe this check belongs there?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On line 395 above it drops things which are exactly type tuple, maybe we could expand that to drop any subtype of tuple too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems reasonable, yeah. I think we'd want to discard
os.Environ
first, and then if there are non-tuple types discard all the tuple types. It's important that if you're resolving a namedtuple, or union of several, that works without discarding all or all-but-one!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated as you described: if there is at least one other type, drop all tuple (sub)classes.
I admit I'm not sure what input to
st.from_type
would causemapping
to be filled with only tuple subclasses. This might be relevant if thecover
tests yell at me for not providing an input which fails the new conditional branch 🙂There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need something along the lines of:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, I don't think this works, because
AbstractStruct
doesn't pass this conditional:hypothesis/hypothesis-python/src/hypothesis/strategies/_internal/core.py
Lines 1364 to 1369 in 9606972
I managed to come up with an alternative test involving a custom protocol whose only concrete instantiations are tuple subtypes - let me know what you think.