diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-27 06:29:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-27 06:29:19 (GMT) |
| commit | 3cbae68de68ecdc5ab9f11836b50b8307768c11c (patch) | |
| tree | cf48536db7ddd0ae8584f5c8ad856e9d6f6bdcad /Objects | |
| parent | 7722769b768c249dc0ae3c69cb271adc71d54156 (diff) | |
| parent | 1791c224dd87ba86236c399c2c8ea916635981c2 (diff) | |
| download | cpython-3cbae68de68ecdc5ab9f11836b50b8307768c11c.zip cpython-3cbae68de68ecdc5ab9f11836b50b8307768c11c.tar.gz cpython-3cbae68de68ecdc5ab9f11836b50b8307768c11c.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index aeb8634..783a83c 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2205,9 +2205,8 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) 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 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, 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 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name, 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); |