-
-
Notifications
You must be signed in to change notification settings - Fork 30.3k
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
gh-111262: Make PyDict_Pop() public #111263
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add a new C-API function PyDict_Pop to replace a previously removed underscore function. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2272,6 +2272,16 @@ | |
return _PyDict_Pop_KnownHash(dict, key, hash, deflt); | ||
} | ||
|
||
PyObject * | ||
PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt) | ||
{ | ||
if (!PyDict_Check(dict)) { | ||
PyErr_BadInternalCall(); | ||
return -1; | ||
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (x64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (x64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (x64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (x64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Ubuntu
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Ubuntu SSL tests with OpenSSL (1.1.1w)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (arm64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (arm64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (arm64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Windows (arm64)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Ubuntu SSL tests with OpenSSL (3.0.11)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Ubuntu SSL tests with OpenSSL (3.1.3)
Check warning on line 2280 in Objects/dictobject.c GitHub Actions / Address sanitizer
|
||
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. Should certainly be |
||
} | ||
return _PyDict_Pop(dict, key, deflt); | ||
} | ||
|
||
/* Internal version of dict.from_keys(). It is subclass-friendly. */ | ||
PyObject * | ||
_PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value) | ||
|
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 would prefer to return -1 on error, 0 if the key doesn't exist, 1 if the key exists.
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.
How would the caller know the popped value then?