summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2008-05-11 21:00:57 (GMT)
committerEric Smith <eric@trueblade.com>2008-05-11 21:00:57 (GMT)
commit5807c415c5b16b9119895cdc80c4608f37c8c30b (patch)
tree2cf4895e2be7e15641c70d92e47272e09b42d826 /Objects/unicodeobject.c
parentaa5b411b41978f3835c49850dd567fc284d9aad5 (diff)
downloadcpython-5807c415c5b16b9119895cdc80c4608f37c8c30b.zip
cpython-5807c415c5b16b9119895cdc80c4608f37c8c30b.tar.gz
cpython-5807c415c5b16b9119895cdc80c4608f37c8c30b.tar.bz2
Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk When forward porting this, I added _PyUnicode_InsertThousandsGrouping. ........ r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines Addresses issue 2802: 'n' formatting for integers. Adds 'n' as a format specifier for integers, to mirror the same specifier which is already available for floats. 'n' is the same as 'd', but inserts the current locale-specific thousands grouping. I added this as a stringlib function, but it's only used by str type, not unicode. This is because of an implementation detail in unicode.format(), which does its own str->unicode conversion. But the unicode version will be needed in 3.0, and it may be needed by other code eventually in 2.6 (maybe decimal?), so I left it as a stringlib implementation. As long as the unicode version isn't instantiated, there's no overhead for this. ........
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index dab4000..08e832f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5234,6 +5234,9 @@ int PyUnicode_EncodeDecimal(Py_UNICODE *s,
#include "stringlib/find.h"
#include "stringlib/partition.h"
+#define _Py_InsertThousandsGrouping _PyUnicode_InsertThousandsGrouping
+#include "stringlib/localeutil.h"
+
/* helper macro to fixup start/end slice values */
#define FIX_START_END(obj) \
if (start < 0) \