From: Eric Smith <eric@trueblade.com>
Date: Wed, 22 Apr 2009 16:20:47 +0000 (+0000)
Subject: Fixed issue 5782: formatting with commas didn't work if no specifier type code was... 
X-Git-Tag: v2.7a1~1434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebafbb705cbc92e7917e2dea423c141ec2b276b4;p=thirdparty%2FPython%2Fcpython.git

Fixed issue 5782: formatting with commas didn't work if no specifier type code was given.
---

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 6fff22a5f0e9..8e9dd720663c 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -405,6 +405,9 @@ class TypesTests(unittest.TestCase):
         test(123456, "#012X", '0X000001E240')
         test(-123456, "#012X", '-0X00001E240')
 
+        # issue 5782, commas with no specifier type
+        test(1234, '010,', '00,001,234')
+
         # make sure these are errors
 
         # precision disallowed
@@ -632,6 +635,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 61ca12badf81..9cbd2cc9310b 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: