Mercurial > cpython-lru_cache-weakref
diff Objects/floatobject.c @ 45381:b7231bf6bfb7 legacy-trunk
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).
| author | Eric Smith <eric@trueblade.com> |
|---|---|
| date | Sun, 17 Feb 2008 19:46:49 +0000 |
| parents | 8fdd6d62ea55 |
| children | 354e377c9590 |
line wrap: on
line diff
--- a/Objects/floatobject.c Sun Feb 17 18:59:29 2008 +0000 +++ b/Objects/floatobject.c Sun Feb 17 19:46:49 2008 +0000 @@ -10,6 +10,7 @@ #include <ctype.h> #include <float.h> +#include "formatter_string.h" #if !defined(__STDC__) extern double fmod(double, double); @@ -1434,6 +1435,46 @@ return PyFloat_FromDouble(0.0); } +static PyObject * +float__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_float__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_float__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; +} + +PyDoc_STRVAR(float__format__doc, +"float.__format__(format_spec) -> string\n" +"\n" +"Formats the float according to format_spec."); + + static PyMethodDef float_methods[] = { {"conjugate", (PyCFunction)float_float, METH_NOARGS, "Returns self, the complex conjugate of any float."}, @@ -1446,6 +1487,8 @@ METH_O|METH_CLASS, float_getformat_doc}, {"__setformat__", (PyCFunction)float_setformat, METH_VARARGS|METH_CLASS, float_setformat_doc}, + {"__format__", (PyCFunction)float__format__, + METH_VARARGS, float__format__doc}, {NULL, NULL} /* sentinel */ };