[Python-checkins] cpython: inherit maxchar of field value where needed (closes #14648)
benjamin.peterson
python-checkins at python.org
Mon Apr 23 16:55:36 CEST 2012
http://hg.python.org/cpython/rev/c7163a7f7cd2
changeset: 76484:c7163a7f7cd2
parent: 76482:b1bd900cc723
user: Benjamin Peterson <benjamin at python.org>
date: Mon Apr 23 10:55:29 2012 -0400
summary:
inherit maxchar of field value where needed (closes #14648)
files:
Lib/test/test_unicode.py | 2 ++
Python/formatter_unicode.c | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1056,6 +1056,8 @@
self.assertEqual('%f' % INF, 'inf')
self.assertEqual('%F' % INF, 'INF')
+ self.assertEqual(format("\u0410\u0411\u0412", "s"), "АБВ")
+
def test_startswith_endswith_errors(self):
for meth in ('foo'.startswith, 'foo'.endswith):
with self.assertRaises(TypeError) as cm:
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -747,6 +747,9 @@
len = format->precision;
}
+ if (len)
+ maxchar = PyUnicode_MAX_CHAR_VALUE(value);
+
calc_padding(len, format->width, format->align, &lpad, &rpad, &total);
if (lpad != 0 || rpad != 0)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list