Changeset 391 for python/trunk/Python/formatter_unicode.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_unicode.c (modified) (1 diff)

python/trunk/Python/formatter_unicode.c

@@ -3 +3 @@
 
 #include "Python.h"
+
+#ifdef Py_USING_UNICODE
+
 #include "../Objects/stringlib/unicodedefs.h"
 
 #define FORMAT_STRING _PyUnicode_FormatAdvanced
 
-/* don't define FORMAT_LONG and FORMAT_FLOAT, since we can live
-   with only the string versions of those.  The builtin format()
-   will convert them to unicode. */
+/* don't define FORMAT_LONG, FORMAT_FLOAT, and FORMAT_COMPLEX, since
+   we can live with only the string versions of those.  The builtin
+   format() will convert them to unicode. */
 
 #include "../Objects/stringlib/formatter.h"
+
+#endif