aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-10-07 20:55:35 +0200
committerMartin v. Löwis <martin@v.loewis.de>2011-10-07 20:55:35 +0200
commitc47adb04b30feea670e87b28efb286db11babaa6 (patch)
tree7b7a3c7fa6227d578a4f1bddac23163170a95c10 /Python/formatter_unicode.c
parentPyUnicode_Join() calls directly memcpy() if all strings are of the same kind (diff)
downloadcpython-c47adb04b30feea670e87b28efb286db11babaa6.tar.gz
cpython-c47adb04b30feea670e87b28efb286db11babaa6.tar.bz2
cpython-c47adb04b30feea670e87b28efb286db11babaa6.zip
Change PyUnicode_KIND to 1,2,4. Drop _KIND_SIZE and _CHARACTER_SIZE.
Diffstat (limited to 'Python/formatter_unicode.c')
-rw-r--r--Python/formatter_unicode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index a389734390a..037880068a7 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -604,9 +604,9 @@ fill_number(PyObject *out, Py_ssize_t pos, const NumberFieldWidths *spec,
#endif
_PyUnicode_InsertThousandsGrouping(
out, kind,
- (char*)data + PyUnicode_KIND_SIZE(kind, pos),
+ (char*)data + kind * pos,
spec->n_grouped_digits,
- pdigits + PyUnicode_KIND_SIZE(kind, d_pos),
+ pdigits + kind * d_pos,
spec->n_digits, spec->n_min_width,
locale->grouping, locale->thousands_sep);
#ifndef NDEBUG