commit d042f1f5eb8b7cfacacc4610df73a6e56f2947b5
author Victor Stinner <victor.stinner@gmail.com> Fri Aug 19 16:56:49 2016 +0200
committer Victor Stinner <victor.stinner@gmail.com> Fri Aug 19 16:56:49 2016 +0200
tree 9ca299a99a204c5e28aa4e01a4a97885bd974f75
parent 64faad6e459c207cd1bce1db2fd9053b44b0a4ac

Cleanup callmethod()

Make callmethod() less weird: don't decrement func reference counter,
the caller is now responsible to do that.

Issue #27128.

Objects/abstract.c

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 64b8e90..9e9c9aa 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2343,9 +2343,10 @@
 {
     PyObject *args, *result;
 
+    assert(func != NULL);
+
     if (!PyCallable_Check(func)) {
         type_error("attribute of type '%.200s' is not callable", func);
-        Py_XDECREF(func);
         return NULL;
     }
 
@@ -2363,7 +2364,6 @@
     }
 
     result = call_function_tail(func, args);
-    Py_XDECREF(func);
     Py_DECREF(args);
     return result;
 }
@@ -2385,6 +2385,7 @@
     va_start(va, format);
     retval = callmethod(func, format, va, 0);
     va_end(va);
+    Py_DECREF(func);
     return retval;
 }
 
@@ -2406,6 +2407,7 @@
     va_start(va, format);
     retval = callmethod(func, format, va, 0);
     va_end(va);
+    Py_DECREF(func);
     return retval;
 }
 
@@ -2426,6 +2428,7 @@
     va_start(va, format);
     retval = callmethod(func, format, va, 1);
     va_end(va);
+    Py_DECREF(func);
     return retval;
 }
 
@@ -2447,6 +2450,7 @@
     va_start(va, format);
     retval = callmethod(func, format, va, 1);
     va_end(va);
+    Py_DECREF(func);
     return retval;
 }