- merge 3.5

This commit is contained in:
doko@ubuntu.com 2016-01-14 14:05:21 +01:00
commit 3b63dc3aa9

View file

@ -2579,7 +2579,7 @@ _PyDict_KeysSize(PyDictKeysObject *keys)
return sizeof(PyDictKeysObject) + (DK_SIZE(keys)-1) * sizeof(PyDictKeyEntry);
}
PyObject *
static PyObject *
dict_sizeof(PyDictObject *mp)
{
return PyLong_FromSsize_t(_PyDict_SizeOf(mp));