cpython (merge 3.4 -> default): merge 3.4
http://hg.python.org/cpython/rev/738262a327af changeset: 91436:738262a327af parent: 91433:169171da66fa parent: 91435:92521be371c5 user: Benjamin Peterson <benjamin@python.org> date: Thu Jun 26 23:29:19 2014 -0700 summary: merge 3.4 files: Objects/abstract.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2205,9 +2205,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2227,9 +2226,8 @@ return null_error(); func = _PyObject_GetAttrId(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2249,9 +2247,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); -- Repository URL: http://hg.python.org/cpython
participants (1)
-
benjamin.peterson