diff options
| author | Eric Smith <eric@trueblade.com> | 2009-04-22 17:04:27 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2009-04-22 17:04:27 (GMT) |
| commit | 937491d1a9a327a782f3717fd1a0d4d9ad8fdc36 (patch) | |
| tree | 9b4d0fb0e6424e3ceed042b4599169a46725db53 | |
| parent | 4738470402eff47379672a45fa5eb447461b38a0 (diff) | |
| download | cpython-937491d1a9a327a782f3717fd1a0d4d9ad8fdc36.zip cpython-937491d1a9a327a782f3717fd1a0d4d9ad8fdc36.tar.gz cpython-937491d1a9a327a782f3717fd1a0d4d9ad8fdc36.tar.bz2 | |
Merged revisions 71802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71802 | eric.smith | 2009-04-22 12:20:47 -0400 (Wed, 22 Apr 2009) | 1 line
Fixed issue 5782: formatting with commas didn't work if no specifier type code was given.
........
| -rw-r--r-- | Lib/test/test_types.py | 6 | ||||
| -rw-r--r-- | Objects/stringlib/formatter.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 5d41e1b..230b102 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -350,6 +350,9 @@ class TypesTests(unittest.TestCase): test(1234567, ',', '1,234,567') test(-1234567, ',', '-1,234,567') + # issue 5782, commas with no specifier type + test(1234, '010,', '00,001,234') + # make sure these are errors # precision disallowed @@ -567,6 +570,9 @@ class TypesTests(unittest.TestCase): test(-1234.12341234, '013f', '-01234.123412') test(-123456.12341234, '011.2f', '-0123456.12') + # issue 5782, commas with no specifier type + test(1.2, '010,.2', '0,000,001.2') + # 0 padding with commas test(1234., '011,f', '1,234.000000') test(1234., '012,f', '1,234.000000') diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h index 61ca12b..9cbd2cc 100644 --- a/Objects/stringlib/formatter.h +++ b/Objects/stringlib/formatter.h @@ -248,6 +248,7 @@ parse_internal_render_format_spec(STRINGLIB_CHAR *format_spec, case 'G': case '%': case 'F': + case '\0': /* These are allowed. See PEP 378.*/ break; default: |