Pass current tests

Author: Lil-Ran

Lib/test/test_format.py

@@ -661,26 +661,38 @@ def test_g_format_has_no_trailing_zeros(self):
         self.assertEqual(format(12300050.0, "#.6g"), "1.23000e+07")
 
     def test_with_two_commas_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify ',' with ','.")
+        error_msg = re.escape("Cannot specify grouping ',' more than once")
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:,,}'.format(1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:.,,}'.format(1.1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:.,,f}'.format(1.1)
 
     def test_with_two_underscore_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify '_' with '_'.")
+        error_msg = re.escape("Cannot specify grouping '_' more than once")
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:__}'.format(1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:.__}'.format(1.1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:.__f}'.format(1.1)
 
-    def test_with_a_commas_and_an_underscore_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify both ',' and '_'.")
+    def test_with_a_comma_and_an_underscore_in_format_specifier(self):
+        error_msg = re.escape("Cannot specify both ',' and '_'")
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:,_}'.format(1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:.,_}'.format(1.1)
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:.,_f}'.format(1.1)
 
     def test_with_an_underscore_and_a_comma_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify both ',' and '_'.")
+        error_msg = re.escape("Cannot specify both ',' and '_'")
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:_,}'.format(1)
+        with self.assertRaisesRegex(ValueError, error_msg):
+            '{:._,}'.format(1.1)
         with self.assertRaisesRegex(ValueError, error_msg):
             '{:._,f}'.format(1.1)
 

Lib/test/test_fstring.py

@@ -1697,24 +1697,32 @@ def test_invalid_syntax_error_message(self):
             compile("f'{a $ b}'", "?", "exec")
 
     def test_with_two_commas_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify ',' with ','.")
+        error_msg = re.escape("Cannot specify grouping ',' more than once")
         with self.assertRaisesRegex(ValueError, error_msg):
             f'{1:,,}'
+        with self.assertRaisesRegex(ValueError, error_msg):
+            f'{1.1:.,,}'
 
     def test_with_two_underscore_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify '_' with '_'.")
+        error_msg = re.escape("Cannot specify grouping '_' more than once")
         with self.assertRaisesRegex(ValueError, error_msg):
             f'{1:__}'
+        with self.assertRaisesRegex(ValueError, error_msg):
+            f'{1.1:.__}'
 
-    def test_with_a_commas_and_an_underscore_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify both ',' and '_'.")
+    def test_with_a_comma_and_an_underscore_in_format_specifier(self):
+        error_msg = re.escape("Cannot specify both ',' and '_'")
         with self.assertRaisesRegex(ValueError, error_msg):
             f'{1:,_}'
+        with self.assertRaisesRegex(ValueError, error_msg):
+            f'{1.1:.,_}'
 
     def test_with_an_underscore_and_a_comma_in_format_specifier(self):
-        error_msg = re.escape("Cannot specify both ',' and '_'.")
+        error_msg = re.escape("Cannot specify both ',' and '_'")
         with self.assertRaisesRegex(ValueError, error_msg):
             f'{1:_,}'
+        with self.assertRaisesRegex(ValueError, error_msg):
+            f'{1.1:._,}'
 
     def test_syntax_error_for_starred_expressions(self):
         with self.assertRaisesRegex(SyntaxError, "can't use starred expression here"):

Objects/unicode_formatter.c

@@ -283,18 +283,18 @@ invalid_thousands_separator_type(char separator, Py_UCS4 presentation_type)
     /* presentation_type has been checked before thousands separator. */
     assert(presentation_type >= 32 && presentation_type < 127);
     PyErr_Format(PyExc_ValueError,
-                 "Cannot specify '%c' with type code '%c'",
+                 "Cannot specify '%c' with '%c'",
                  separator, (int)presentation_type);
 }
 
 static void
 invalid_fraction_separator_type(char separator, Py_UCS4 presentation_type)
 {
     assert(separator == ',' || separator == '_');
-    /* presentation_type has been checked before thousands separator. */
+    /* presentation_type has been checked before fraction separator. */
     assert(presentation_type >= 32 && presentation_type < 127);
     PyErr_Format(PyExc_ValueError,
-                 "Cannot specify '%c' in fractional part with type code '%c'",
+                 "Cannot specify '%c' in fractional part with '%c'",
                  separator, (int)presentation_type);
 }
 
@@ -551,7 +551,17 @@ parse_internal_render_format_spec(PyObject *obj,
                          "Format specifier missing precision");
             return 0;
         }
+    }
 
+    if (end-pos) {
+        Py_UCS4 next = READ_spec(pos);
+        if (next == ',' || next == '_') {
+            /* Expect type, got another grouping character */
+            PyErr_Format(PyExc_ValueError,
+                         "Cannot specify grouping '%c' more than once",
+                         next);
+            return 0;
+        }
     }
 
     /* Finally, parse the type field. */