From: Eli Bendersky <eliben@gmail.com>
Date: Wed, 24 Apr 2013 12:34:07 +0000 (-0700)
Subject: Revert c9674421d78e, leaving an additional comment
X-Git-Tag: v3.4.0a1~849
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45f3d2fff08af8b13a52f72d2342934253e3690d;p=thirdparty%2FPython%2Fcpython.git

Revert c9674421d78e, leaving an additional comment
---

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 5a1ed8c284d2..f5b0914720c6 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -278,25 +278,30 @@ element_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static PyObject*
 get_attrib_from_keywords(PyObject *kwds)
 {
-    const char* ATTRIB_KEY = "attrib";
-    PyObject *attrib = PyDict_GetItemString(kwds, ATTRIB_KEY);
+    PyObject *attrib_str = PyUnicode_FromString("attrib");
+    PyObject *attrib = PyDict_GetItem(kwds, attrib_str);
 
     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_DelItemString(kwds, ATTRIB_KEY);
+        PyDict_DelItem(kwds, attrib_str);
     } else {
         attrib = PyDict_New();
     }
-    assert(attrib);
-    PyDict_Update(attrib, kwds);
+
+    Py_DECREF(attrib_str);
+
+    /* attrib can be NULL if PyDict_New failed */
+    if (attrib)
+        PyDict_Update(attrib, kwds);
     return attrib;
 }