traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inherit maxchar of field value where needed (closes #14648)

This commit is contained in:
Benjamin Peterson 2012-04-23 10:55:29 -04:00
parent 1cf5aa9106
commit 80d07f8251
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_unicode.py
View File

@ -1056,6 +1056,8 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual('%f' % INF, 'inf') self.assertEqual('%f' % INF, 'inf')
self.assertEqual('%F' % INF, 'INF') self.assertEqual('%F' % INF, 'INF')
self.assertEqual(format("\u0410\u0411\u0412", "s"), "АБВ")
def test_startswith_endswith_errors(self): def test_startswith_endswith_errors(self):
for meth in ('foo'.startswith, 'foo'.endswith): for meth in ('foo'.startswith, 'foo'.endswith):
with self.assertRaises(TypeError) as cm: with self.assertRaises(TypeError) as cm:

3
Python/formatter_unicode.c
View File

@ -747,6 +747,9 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format)
len = format->precision; len = format->precision;
} }
if (len)
maxchar = PyUnicode_MAX_CHAR_VALUE(value);
calc_padding(len, format->width, format->align, &lpad, &rpad, &total); calc_padding(len, format->width, format->align, &lpad, &rpad, &total);
if (lpad != 0 || rpad != 0) if (lpad != 0 || rpad != 0)