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

Closes issue #12546: Allow \x00 as a fill character for builtin type __format__ methods.

This commit is contained in:
Eric V. Smith 2014-04-14 12:08:21 -04:00
parent f33201b6db 2ea9712ee9
commit 280c458f9e
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_unicode.py
View File

@ -874,6 +874,27 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual('{0:10000}'.format(''), ' ' * 10000)
self.assertEqual('{0:10000000}'.format(''), ' ' * 10000000)
# issue 12546: use \x00 as a fill character
self.assertEqual('{0:\x00<6s}'.format('foo'), 'foo\x00\x00\x00')
self.assertEqual('{0:\x01<6s}'.format('foo'), 'foo\x01\x01\x01')
self.assertEqual('{0:\x00^6s}'.format('foo'), '\x00foo\x00\x00')
self.assertEqual('{0:^6s}'.format('foo'), ' foo ')
self.assertEqual('{0:\x00<6}'.format(3), '3\x00\x00\x00\x00\x00')
self.assertEqual('{0:\x01<6}'.format(3), '3\x01\x01\x01\x01\x01')
self.assertEqual('{0:\x00^6}'.format(3), '\x00\x003\x00\x00\x00')
self.assertEqual('{0:<6}'.format(3), '3 ')
self.assertEqual('{0:\x00<6}'.format(3.14), '3.14\x00\x00')
self.assertEqual('{0:\x01<6}'.format(3.14), '3.14\x01\x01')
self.assertEqual('{0:\x00^6}'.format(3.14), '\x003.14\x00')
self.assertEqual('{0:^6}'.format(3.14), ' 3.14 ')
self.assertEqual('{0:\x00<12}'.format(3+2.0j), '(3+2j)\x00\x00\x00\x00\x00\x00')
self.assertEqual('{0:\x01<12}'.format(3+2.0j), '(3+2j)\x01\x01\x01\x01\x01\x01')
self.assertEqual('{0:\x00^12}'.format(3+2.0j), '\x00\x00\x00(3+2j)\x00\x00\x00')
self.assertEqual('{0:^12}'.format(3+2.0j), ' (3+2j) ')
# format specifiers for user defined type
self.assertEqual('{0:abc}'.format(C()), 'abc')

3
Misc/NEWS
View File

@ -34,6 +34,9 @@ Core and Builtins
- Issue #19995: %c, %o, %x, and %X now raise TypeError on non-integer input.
- Issue #12546: Allow \x00 to be used as a fill character when using str, int,
float, and complex __format__ methods.
Library
-------

19
Python/formatter_unicode.c
View File

@ -156,8 +156,9 @@ parse_internal_render_format_spec(PyObject *format_spec,
Py_ssize_t consumed;
int align_specified = 0;
int fill_char_specified = 0;
format->fill_char = '\0';
format->fill_char = ' ';
format->align = default_align;
format->alternate = 0;
format->sign = '\0';
@ -171,6 +172,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
if (end-pos >= 2 && is_alignment_token(READ_spec(pos+1))) {
format->align = READ_spec(pos+1);
format->fill_char = READ_spec(pos);
fill_char_specified = 1;
align_specified = 1;
pos += 2;
}
@ -194,7 +196,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
}
/* The special case for 0-padding (backwards compat) */
if (format->fill_char == '\0' && end-pos >= 1 && READ_spec(pos) == '0') {
if (!fill_char_specified && end-pos >= 1 && READ_spec(pos) == '0') {
format->fill_char = '0';
if (!align_specified) {
format->align = '=';
@ -784,9 +786,7 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format,
goto done;
/* Write into that space. First the padding. */
result = fill_padding(writer, len,
format->fill_char=='\0'?' ':format->fill_char,
lpad, rpad);
result = fill_padding(writer, len, format->fill_char, lpad, rpad);
if (result == -1)
goto done;
@ -956,8 +956,7 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format,
/* Populate the memory. */
result = fill_number(writer, &spec,
tmp, inumeric_chars, inumeric_chars + n_digits,
tmp, prefix,
format->fill_char == '\0' ? ' ' : format->fill_char,
tmp, prefix, format->fill_char,
&locale, format->type == 'X');
done:
@ -1104,8 +1103,7 @@ format_float_internal(PyObject *value,
/* Populate the memory. */
result = fill_number(writer, &spec,
unicode_tmp, index, index + n_digits,
NULL, 0,
format->fill_char == '\0' ? ' ' : format->fill_char,
NULL, 0, format->fill_char,
&locale, 0);
done:
@ -1311,8 +1309,7 @@ format_complex_internal(PyObject *value,
/* Populate the memory. First, the padding. */
result = fill_padding(writer,
n_re_total + n_im_total + 1 + add_parens * 2,
format->fill_char=='\0' ? ' ' : format->fill_char,
lpad, rpad);
format->fill_char, lpad, rpad);
if (result == -1)
goto done;