From a9f7d6248032c9572b4d2024a1be8bd2823af09f Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Sun, 17 Feb 2008 19:46:49 +0000 Subject: Backport of PEP 3101, Advanced String Formatting, from py3k. Highlights: - Adding PyObject_Format. - Adding string.Format class. - Adding __format__ for str, unicode, int, long, float, datetime. - Adding builtin format. - Adding ''.format and u''.format. - str/unicode fixups for formatters. The files in Objects/stringlib that implement PEP 3101 (stringdefs.h, unicodedefs.h, formatter.h, string_format.h) are identical in trunk and py3k. Any changes from here on should be made to trunk, and changes will propogate to py3k). --- Objects/intobject.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'Objects/intobject.c') diff --git a/Objects/intobject.c b/Objects/intobject.c index 2fdea259e2..65c1c23dac 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -3,6 +3,7 @@ #include "Python.h" #include +#include "formatter_string.h" static PyObject *int_int(PyIntObject *v); @@ -1108,12 +1109,47 @@ _PyInt_Format(PyIntObject *v, int base, int newstyle) return PyString_FromStringAndSize(p, &buf[sizeof(buf)] - p); } +static PyObject * +int__format__(PyObject *self, PyObject *args) +{ + PyObject *format_spec; + + if (!PyArg_ParseTuple(args, "O:__format__", &format_spec)) + return NULL; + if (PyString_Check(format_spec)) + return string_int__format__(self, args); + if (PyUnicode_Check(format_spec)) { + /* Convert format_spec to a str */ + PyObject *result = NULL; + PyObject *newargs = NULL; + PyObject *string_format_spec = NULL; + + 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; + + result = string_int__format__(self, newargs); + + done: + Py_XDECREF(string_format_spec); + Py_XDECREF(newargs); + return result; + } + PyErr_SetString(PyExc_TypeError, "__format__ requires str or unicode"); + return NULL; +} + static PyMethodDef int_methods[] = { {"conjugate", (PyCFunction)int_int, METH_NOARGS, "Returns self, the complex conjugate of any int."}, {"__trunc__", (PyCFunction)int_int, METH_NOARGS, "Truncating an Integral returns itself."}, {"__getnewargs__", (PyCFunction)int_getnewargs, METH_NOARGS}, + {"__format__", (PyCFunction)int__format__, METH_VARARGS}, {NULL, NULL} /* sentinel */ }; -- cgit v1.2.1