From 1859fe80c424cd2c8211c90f1c46a64606cb8ccb Mon Sep 17 00:00:00 2001 From: Eli Bendersky Date: Mon, 22 Apr 2013 05:52:16 -0700 Subject: Simplify the code of get_attrib_from_keywords somewhat. --- Modules/_elementtree.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index b05a39f..5a1ed8c 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -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; } -- cgit v0.12