summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2007-08-25 02:26:07 (GMT)
committerEric Smith <eric@trueblade.com>2007-08-25 02:26:07 (GMT)
commit8c6632636807c35bee40210ed8483c1eca82664f (patch)
tree50f386d98ce14116eaf9d83085b82ff11bdb3e69 /Makefile.pre.in
parente4dc32488446240942123cf4e9e7296ad97e20bf (diff)
downloadcpython-8c6632636807c35bee40210ed8483c1eca82664f.zip
cpython-8c6632636807c35bee40210ed8483c1eca82664f.tar.gz
cpython-8c6632636807c35bee40210ed8483c1eca82664f.tar.bz2
Implementation of PEP 3101, Advanced String Formatting.
Known issues: The string.Formatter class, as discussed in the PEP, is incomplete. Error handling needs to conform to the PEP. Need to fix this warning that I introduced in Python/formatter_unicode.c: Objects/stringlib/unicodedefs.h:26: warning: `STRINGLIB_CMP' defined but not used Need to make sure sign formatting is correct, more tests needed. Need to remove '()' sign formatting, left over from an earlier version of the PEP.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in15
1 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4e9bab1..53012e8 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -271,6 +271,7 @@ PYTHON_OBJS= \
Python/traceback.o \
Python/getopt.o \
Python/pystrtod.o \
+ Python/formatter_unicode.o \
Python/$(DYNLOADFILE) \
$(MACHDEP_OBJS) \
$(THREADOBJ)
@@ -503,6 +504,19 @@ Python/importdl.o: $(srcdir)/Python/importdl.c
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
$(srcdir)/Objects/unicodetype_db.h
+Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
+ $(srcdir)/Objects/stringlib/string_format.h \
+ $(srcdir)/Objects/stringlib/unicodedefs.h \
+ $(srcdir)/Objects/stringlib/fastsearch.h \
+ $(srcdir)/Objects/stringlib/count.h \
+ $(srcdir)/Objects/stringlib/find.h \
+ $(srcdir)/Objects/stringlib/partition.h
+
+Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
+ $(srcdir)/Objects/stringlib/formatter.h
+
+
+
############################################################################
# Header files
@@ -527,6 +541,7 @@ PYTHON_HEADERS= \
Include/genobject.h \
Include/fileobject.h \
Include/floatobject.h \
+ Include/formatter_unicode.h \
Include/funcobject.h \
Include/import.h \
Include/intobject.h \