diff options
| author | Eric Smith <eric@trueblade.com> | 2008-05-30 18:10:19 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2008-05-30 18:10:19 (GMT) |
| commit | 4a7d76ddb51422e2adb0fb56afa5b82162837e52 (patch) | |
| tree | 266a1c326d040ce45be22c4c785edec2f7f67f02 /Objects/floatobject.c | |
| parent | eb2c964aeb0ab0e3e01560c955cab95f8e3b92c2 (diff) | |
| download | cpython-4a7d76ddb51422e2adb0fb56afa5b82162837e52.zip cpython-4a7d76ddb51422e2adb0fb56afa5b82162837e52.tar.gz cpython-4a7d76ddb51422e2adb0fb56afa5b82162837e52.tar.bz2 | |
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Diffstat (limited to 'Objects/floatobject.c')
| -rw-r--r-- | Objects/floatobject.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 76a5c2c..dd3ea93 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -7,8 +7,6 @@ #include "Python.h" #include "structseq.h" -#include "formatter_unicode.h" - #include <ctype.h> #include <float.h> @@ -1303,10 +1301,13 @@ float_getzero(PyObject *v, void *closure) static PyObject * float__format__(PyObject *self, PyObject *args) { - /* when back porting this to 2.6, check type of the format_spec - and call either unicode_long__format__ or - string_long__format__ */ - return unicode_float__format__(self, args); + PyObject *format_spec; + + if (!PyArg_ParseTuple(args, "U:__format__", &format_spec)) + return NULL; + return _PyFloat_FormatAdvanced(self, + PyUnicode_AS_UNICODE(format_spec), + PyUnicode_GET_SIZE(format_spec)); } PyDoc_STRVAR(float__format__doc, |