Changeset 391 for python/trunk/Python/formatter_string.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/formatter_string.c (modified) (1 diff)

python/trunk/Python/formatter_string.c

@@ -2 +2 @@
 /* Implements the string (as opposed to unicode) version of the
    built-in formatters for string, int, float.  That is, the versions
-   of int.__float__, etc., that take and return string objects */
+   of int.__format__, etc., that take and return string objects */
 
 #include "Python.h"
 #include "../Objects/stringlib/stringdefs.h"
 
-#define FORMAT_STRING _PyBytes_FormatAdvanced
-#define FORMAT_LONG   _PyLong_FormatAdvanced
-#define FORMAT_INT    _PyInt_FormatAdvanced
-#define FORMAT_FLOAT  _PyFloat_FormatAdvanced
+#define FORMAT_STRING  _PyBytes_FormatAdvanced
+#define FORMAT_LONG    _PyLong_FormatAdvanced
+#define FORMAT_INT     _PyInt_FormatAdvanced
+#define FORMAT_FLOAT   _PyFloat_FormatAdvanced
+#ifndef WITHOUT_COMPLEX
+#define FORMAT_COMPLEX _PyComplex_FormatAdvanced
+#endif
 
 #include "../Objects/stringlib/formatter.h"