mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

refactor and avoid warnings

Browse source
This commit is contained in:
Benjamin Peterson 2012-03-09 07:25:32 -08:00
parent 8c43e69bce
commit 74529ad3f4
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/object.c
View file

@ -1152,13 +1152,11 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
name->ob_type->tp_name); name->ob_type->tp_name);
return -1; return -1;
} }
else
Py_INCREF(name);
if (tp->tp_dict == NULL) { if (tp->tp_dict == NULL && PyType_Ready(tp) < 0)
if (PyType_Ready(tp) < 0) return -1;
goto done;
} Py_INCREF(name);
descr = _PyType_Lookup(tp, name); descr = _PyType_Lookup(tp, name);
Py_XINCREF(descr); Py_XINCREF(descr);
@ -1190,9 +1188,9 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
res = PyDict_DelItem(dict, name); res = PyDict_DelItem(dict, name);
else else
res = PyDict_SetItem(dict, name, value); res = PyDict_SetItem(dict, name, value);
Py_DECREF(dict);
if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError)) if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
PyErr_SetObject(PyExc_AttributeError, name); PyErr_SetObject(PyExc_AttributeError, name);
Py_DECREF(dict);
goto done; goto done;
} }