Skip to content

C
cpython
Kaydet (Commit) 3cbae68d authored tarafından Benjamin Peterson's avatar Benjamin Peterson
Dosyalara gözat
Seçenekler

merge 3.4

üst 7722769b 1791c224
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
Objects/abstract.c
Dosyayı görüntüle @ 3cbae68d
...@@ -2205,9 +2205,8 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) ...@@ -2205,9 +2205,8 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...)
return null_error(); return null_error();
func = PyObject_GetAttrString(o, name); func = PyObject_GetAttrString(o, name);
if (func == NULL) { if (func == NULL)
return 0; return NULL;
}
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 0); retval = callmethod(func, format, va, 0);
...@@ -2227,9 +2226,8 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, ...@@ -2227,9 +2226,8 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name,
return null_error(); return null_error();
func = _PyObject_GetAttrId(o, name); func = _PyObject_GetAttrId(o, name);
if (func == NULL) { if (func == NULL)
return 0; return NULL;
}
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 0); retval = callmethod(func, format, va, 0);
...@@ -2249,9 +2247,8 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name, ...@@ -2249,9 +2247,8 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name,
return null_error(); return null_error();
func = PyObject_GetAttrString(o, name); func = PyObject_GetAttrString(o, name);
if (func == NULL) { if (func == NULL)
return 0; return NULL;
}
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 1); retval = callmethod(func, format, va, 1);
va_end(va); va_end(va);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment