Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

implement object.__format__ with PyObject_Format

This commit is contained in:
Benjamin Peterson 2010-06-05 00:56:46 +00:00
parent 3a2acb5040
commit 039c585805
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/typeobject.c
View File

@ -3413,7 +3413,6 @@ object_format(PyObject *self, PyObject *args)
PyObject *format_spec;
PyObject *self_as_str = NULL;
PyObject *result = NULL;
PyObject *format_meth = NULL;
Py_ssize_t format_len;
if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
@ -3449,21 +3448,11 @@ object_format(PyObject *self, PyObject *args)
goto done;
*/
}
/* find the format function */
format_meth = PyObject_GetAttrString(self_as_str,
"__format__");
if (format_meth != NULL) {
/* and call it */
result = PyObject_CallFunctionObjArgs(format_meth,
format_spec,
NULL);
}
return PyObject_Format(self_as_str, format_spec);
}
done:
Py_XDECREF(self_as_str);
Py_XDECREF(format_meth);
return result;
}