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

benjaminp · benjaminp · commit a46da7aee184 · 2012-04-23T10:55:29.000-04:00
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
@@ -1056,6 +1056,8 @@ def __str__(self):
         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
@@ -747,6 +747,9 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format)
         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)

Original file line number	Diff line number	Diff line change
`@@ -747,6 +747,9 @@ format_string_internal(PyObject value, const InternalFormatSpec format)`
`747`	`747`	`len = format->precision;`
`748`	`748`	`}`
`749`	`749`
	`750`	`+ if (len)`
	`751`	`+ maxchar = PyUnicode_MAX_CHAR_VALUE(value);`
	`752`	`+`
`750`	`753`	`calc_padding(len, format->width, format->align, &lpad, &rpad, &total);`
`751`	`754`
`752`	`755`	`if (lpad != 0 \|\| rpad != 0)`