diff options
Diffstat (limited to 'Objects/longobject.c')
| -rw-r--r-- | Objects/longobject.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c index 5922aa5..82a57ec 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -6,7 +6,6 @@ #include "Python.h" #include "longintrepr.h" -#include "formatter_string.h" #include <ctype.h> @@ -3415,26 +3414,22 @@ long__format__(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "O:__format__", &format_spec)) return NULL; if (PyBytes_Check(format_spec)) - return string_long__format__(self, args); + return _PyLong_FormatAdvanced(self, + PyBytes_AS_STRING(format_spec), + PyBytes_GET_SIZE(format_spec)); if (PyUnicode_Check(format_spec)) { /* Convert format_spec to a str */ - PyObject *result = NULL; - PyObject *newargs = NULL; - PyObject *string_format_spec = NULL; + PyObject *result; + PyObject *str_spec = PyObject_Str(format_spec); - string_format_spec = PyObject_Str(format_spec); - if (string_format_spec == NULL) - goto done; - - newargs = Py_BuildValue("(O)", string_format_spec); - if (newargs == NULL) - goto done; + if (str_spec == NULL) + return NULL; - result = string_long__format__(self, newargs); + result = _PyLong_FormatAdvanced(self, + PyBytes_AS_STRING(str_spec), + PyBytes_GET_SIZE(str_spec)); - done: - Py_XDECREF(string_format_spec); - Py_XDECREF(newargs); + Py_DECREF(str_spec); return result; } PyErr_SetString(PyExc_TypeError, "__format__ requires str or unicode"); |