summaryrefslogtreecommitdiff
path: root/Python/formatter_string.c
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2008-05-30 18:10:04 +0000
committerEric Smith <eric@trueblade.com>2008-05-30 18:10:04 +0000
commitdc13b79a384691ed966f760a58d73a1b835e7d6b (patch)
tree40aa36feea2e0ee23f41801a8959990914e3fc71 /Python/formatter_string.c
parent30fadc17990baf4005081d2cdcb8d3adc9c45a7a (diff)
downloadcpython-git-dc13b79a384691ed966f760a58d73a1b835e7d6b.tar.gz
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Diffstat (limited to 'Python/formatter_string.c')
-rw-r--r--Python/formatter_string.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/Python/formatter_string.c b/Python/formatter_string.c
index 1041852bf3..f33ad70586 100644
--- a/Python/formatter_string.c
+++ b/Python/formatter_string.c
@@ -4,12 +4,11 @@
of int.__float__, etc., that take and return string objects */
#include "Python.h"
-#include "formatter_string.h"
-
#include "../Objects/stringlib/stringdefs.h"
-#define FORMAT_STRING string__format__
-#define FORMAT_LONG string_long__format__
-#define FORMAT_INT string_int__format__
-#define FORMAT_FLOAT string_float__format__
+#define FORMAT_STRING _PyBytes_FormatAdvanced
+#define FORMAT_LONG _PyLong_FormatAdvanced
+#define FORMAT_INT _PyInt_FormatAdvanced
+#define FORMAT_FLOAT _PyFloat_FormatAdvanced
+
#include "../Objects/stringlib/formatter.h"