-
-
Notifications
You must be signed in to change notification settings - Fork 32.1k
bpo-39264: Fix UserDict.get() to account for __missing__() #17910
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9d2e344
Merge pull request #1 from python/master
bharel e249b30
Merge remote-tracking branch 'upstream/master'
bharel 66e9813
Merge remote-tracking branch 'upstream/master'
bharel 2c43f53
Merge remote-tracking branch 'upstream/master'
bharel 736b0f4
Merge remote-tracking branch 'upstream/master'
bharel 9e9d911
fix UserDict
bharel 6215e52
added tests
bharel 0b68385
added news entry
bharel 26ea94a
Retry ubuntu tests
bharel c892800
Update Misc/NEWS.d/next/Library/2020-01-09-01-57-12.bpo-39264.GsBL9-.rst
bharel 909170f
Update Lib/test/test_collections.py
bharel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -973,10 +973,17 @@ def __delitem__(self, key): del self.data[key] | |
def __iter__(self): | ||
return iter(self.data) | ||
|
||
# Modify __contains__ to work correctly when __missing__ is present | ||
# Modify __contains__ and get() to work like dict | ||
# does when __missing__ is present. | ||
def __contains__(self, key): | ||
return key in self.data | ||
|
||
def get(self, key, default=None): | ||
if key in self: | ||
bharel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return self[key] | ||
return default | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: Only one blank line so as to match the surrounding code. |
||
|
||
# Now, add the methods in dicts but not in MutableMapping | ||
def __repr__(self): return repr(self.data) | ||
def __copy__(self): | ||
|
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
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Library/2020-01-09-01-57-12.bpo-39264.GsBL9-.rst
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Fixed :meth:`collections.UserDict.get` to not call | ||
:meth:`__missing__` when a value is not found. This matches the behavior of | ||
:class:`dict`. Patch by Bar Harel. |
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.
Add a comment that get() is overridden to avoid a False positive when _missing_ is defined.