Use fully qualified type names more consistently, more msg = in tests

Author: brianschubert

Lib/test/test_ast/test_ast.py

@@ -458,7 +458,7 @@ def test_field_attr_writable(self):
         self.assertEqual(x._fields, 666)
 
     def test_classattrs(self):
-        msg = "Constant.__init__ missing 1 required positional argument: 'value'"
+        msg = "ast.Constant.__init__ missing 1 required positional argument: 'value'"
         with self.assertRaisesRegex(TypeError, re.escape(msg)):
             x = ast.Constant()
 
@@ -485,11 +485,12 @@ def test_classattrs(self):
         self.assertRaises(TypeError, ast.Constant, 1, None, 2, lineno=0)
 
         # Arbitrary keyword arguments are not supported
-        msg = "Constant.__init__ got an unexpected keyword argument 'foo'"
+        msg = "ast.Constant.__init__ got an unexpected keyword argument 'foo'"
         with self.assertRaisesRegex(TypeError, re.escape(msg)):
             ast.Constant(1, foo='bar')
 
-        with self.assertRaisesRegex(TypeError, "Constant got multiple values for argument 'value'"):
+        msg = "ast.Constant got multiple values for argument 'value'"
+        with self.assertRaisesRegex(TypeError, re.escape(msg)):
             ast.Constant(1, value=2)
 
         self.assertEqual(ast.Constant(42).value, 42)
@@ -529,7 +530,7 @@ def test_module(self):
 
     def test_nodeclasses(self):
         # Zero arguments constructor is not allowed
-        msg = "missing 3 required positional arguments: 'left', 'op', and 'right'"
+        msg = "ast.BinOp.__init__ missing 3 required positional arguments: 'left', 'op', and 'right'"
         with self.assertRaisesRegex(TypeError, re.escape(msg)):
             x = ast.BinOp()
 
@@ -3211,8 +3212,8 @@ def test_FunctionDef(self):
         args = ast.arguments()
         self.assertEqual(args.args, [])
         self.assertEqual(args.posonlyargs, [])
-        with self.assertRaisesRegex(TypeError,
-                                   r"FunctionDef\.__init__ missing 1 required positional argument: 'name'"):
+        msg = "ast.FunctionDef.__init__ missing 1 required positional argument: 'name'"
+        with self.assertRaisesRegex(TypeError, re.escape(msg)):
             node = ast.FunctionDef(args=args)
 
         node = ast.FunctionDef(name='foo', args=args)
@@ -3232,8 +3233,8 @@ def test_expr_context(self):
         self.assertEqual(name3.id, "x")
         self.assertIsInstance(name3.ctx, ast.Del)
 
-        with self.assertRaisesRegex(TypeError,
-                                   r"Name\.__init__ missing 1 required positional argument: 'id'"):
+        msg = "ast.Name.__init__ missing 1 required positional argument: 'id'"
+        with self.assertRaisesRegex(TypeError, re.escape(msg)):
             name3 = ast.Name()
 
     def test_custom_subclass_with_no_fields(self):

Parser/asdl_c.py

@@ -1006,8 +1006,8 @@ def visitModule(self, mod):
                 }
                 if (p == 0) {
                     PyErr_Format(PyExc_TypeError,
-                        "%.400s got multiple values for argument '%U'",
-                        Py_TYPE(self)->tp_name, key);
+                        "%T got multiple values for argument '%U'",
+                        self, key);
                     res = -1;
                     goto cleanup;
                 }