mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge 3.6 (issue #28544)

Browse source
This commit is contained in:
Yury Selivanov 2016-10-28 19:01:46 -04:00
commit f0bbee6228
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/dictobject.c
View file

@ -1769,13 +1769,17 @@ PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
/* Internal version of dict.pop(). */
PyObject *
_PyDict_Pop(PyDictObject *mp, PyObject *key, PyObject *deflt)
_PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
{
Py_hash_t hash;
Py_ssize_t ix, hashpos;
PyObject *old_value, *old_key;
PyDictKeyEntry *ep;
PyObject **value_addr;
PyDictObject *mp;
assert(PyDict_Check(dict));
mp = (PyDictObject *)dict;
if (mp->ma_used == 0) {
if (deflt) {
@ -2837,7 +2841,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
return NULL;
return _PyDict_Pop(mp, key, deflt);
return _PyDict_Pop((PyObject*)mp, key, deflt);
}
static PyObject *