mirrors/cpython
mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-01 11:15:56 +01:00
Code Issues Releases Activity

Simplify the code of get_attrib_from_keywords somewhat.

Browse Source
This commit is contained in:
Eli Bendersky 2013-04-22 05:52:16 -07:00
parent ed8b86d323
commit 1859fe80c4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/_elementtree.c
View File

@ -278,29 +278,25 @@ element_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static PyObject*
get_attrib_from_keywords(PyObject *kwds)
{
PyObject *attrib_str = PyUnicode_FromString("attrib");
PyObject *attrib = PyDict_GetItem(kwds, attrib_str);
const char* ATTRIB_KEY = "attrib";
PyObject *attrib = PyDict_GetItemString(kwds, ATTRIB_KEY);
if (attrib) {
/* If attrib was found in kwds, copy its value and remove it from
* kwds
*/
if (!PyDict_Check(attrib)) {
Py_DECREF(attrib_str);
PyErr_Format(PyExc_TypeError, "attrib must be dict, not %.100s",
Py_TYPE(attrib)->tp_name);
return NULL;
}
attrib = PyDict_Copy(attrib);
PyDict_DelItem(kwds, attrib_str);
PyDict_DelItemString(kwds, ATTRIB_KEY);
} else {
attrib = PyDict_New();
}
Py_DECREF(attrib_str);
if (attrib)
PyDict_Update(attrib, kwds);
assert(attrib);
PyDict_Update(attrib, kwds);
return attrib;
}