Skip to content

Add PyDict_Pop() function #81

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.

Sign up for GitHub

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
vstinner merged 3 commits into from
Nov 14, 2023
Merged

Add PyDict_Pop() function #81

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
359c455
Add PyDict_Pop() function
vstinner Nov 14, 2023
87cf8e6
Add cast on Python 3.5
vstinner Nov 14, 2023
3889b05
Fix Python 3.13.0a1
vstinner Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix Python 3.13.0a1
  • Loading branch information
@vstinner
vstinner committed Nov 14, 2023
commit 3889b052b60ea4e7cdcd36c6f7c0c326509e502a
7 changes: 4 additions & 3 deletions pythoncapi_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,10 +1043,11 @@ PyDict_Pop(PyObject *dict, PyObject *key, PyObject **result)
return -1;
}

// bpo-16991 added _PyDict_Pop() to Python 3.5.0b2
#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x030500b2
// bpo-16991 added _PyDict_Pop() to Python 3.5.0b2.
// Python 3.6.0b3 changed _PyDict_Pop() first argument type to PyObject*.
// Python 3.13.0a1 removed _PyDict_Pop().
#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x030500b2 || PY_VERSION_HEX >= 0x030D0000
value = PyObject_CallMethod(dict, "pop", "O", key);
// Python 3.6.0b3 changed _PyDict_Pop() first argument type to PyObject*
#elif PY_VERSION_HEX < 0x030600b3
value = _PyDict_Pop(_Py_CAST(PyDictObject*, dict), key, NULL);
#else
Expand Down