]> granicus.if.org Git - python/commitdiff
Issue #27118: Clean up Py_XINCREF/Py_XDECREF in typeobject.c.
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 25 May 2016 13:14:55 +0000 (16:14 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 25 May 2016 13:14:55 +0000 (16:14 +0300)
Patch by Xiang Zhang.

Objects/typeobject.c

index 9e7b4e64830c56f8752b9de4e6b2491794df4edf..f869c8d8356900eb9fb86ef19b9290e8b87a5a92 100644 (file)
@@ -460,7 +460,7 @@ type_module(PyTypeObject *type, void *context)
             PyErr_Format(PyExc_AttributeError, "__module__");
             return 0;
         }
-        Py_XINCREF(mod);
+        Py_INCREF(mod);
         return mod;
     }
     else {
@@ -500,7 +500,7 @@ type_abstractmethods(PyTypeObject *type, void *context)
             PyErr_SetObject(PyExc_AttributeError, message);
         return NULL;
     }
-    Py_XINCREF(mod);
+    Py_INCREF(mod);
     return mod;
 }
 
@@ -1534,7 +1534,6 @@ class_name(PyObject *cls)
     PyObject *name = _PyObject_GetAttrId(cls, &PyId___name__);
     if (name == NULL) {
         PyErr_Clear();
-        Py_XDECREF(name);
         name = PyObject_Repr(cls);
     }
     if (name == NULL)
@@ -5776,8 +5775,8 @@ slot_sq_item(PyObject *self, Py_ssize_t i)
             if (args != NULL) {
                 PyTuple_SET_ITEM(args, 0, ival);
                 retval = PyObject_Call(func, args, NULL);
-                Py_XDECREF(args);
-                Py_XDECREF(func);
+                Py_DECREF(args);
+                Py_DECREF(func);
                 return retval;
             }
         }