mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

merge 3.2 (#14752)

Browse source
This commit is contained in:
Benjamin Peterson 2012-05-08 09:22:45 -04:00
commit 1cffbac2cb
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/typeobject.c
View file

@ -3709,6 +3709,7 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
for (; meth->ml_name != NULL; meth++) { for (; meth->ml_name != NULL; meth++) {
PyObject *descr; PyObject *descr;
int err;
if (PyDict_GetItemString(dict, meth->ml_name) && if (PyDict_GetItemString(dict, meth->ml_name) &&
!(meth->ml_flags & METH_COEXIST)) !(meth->ml_flags & METH_COEXIST))
continue; continue;
@ -3732,9 +3733,10 @@ add_methods(PyTypeObject *type, PyMethodDef *meth)
} }
if (descr == NULL) if (descr == NULL)
return -1; return -1;
if (PyDict_SetItemString(dict, meth->ml_name, descr) < 0) err = PyDict_SetItemString(dict, meth->ml_name, descr);
return -1;
Py_DECREF(descr); Py_DECREF(descr);
if (err < 0)
return -1;
} }
return 0; return 0;
} }