Address code review

corona10 · corona10 · commit 0892d0df11ea · 2023-11-27T21:46:57.000+09:00
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
@@ -638,7 +638,7 @@ class C "void *" ""
             C.__init__ = C.meth
             [clinic start generated code]*/
         """
-        err = "'__init__' must be a normal method, not a classmethod, staticmethod or getter!"
+        err = "'__init__' must be a normal method; got 'FunctionKind.CLASS_METHOD'!"
         self.expect_failure(block, err, lineno=8)
 
     def test_validate_cloned_new(self):
@@ -2180,17 +2180,22 @@ class Foo "" ""
         self.expect_failure(block, err, lineno=2)
 
     def test_init_must_be_a_normal_method(self):
-        err = "'__init__' must be a normal method, not a classmethod, staticmethod or getter!"
-        annotations = ["@classmethod", "@staticmethod", "@getter"]
-        for annotation in annotations:
-            with self.subTest(annotation=annotation):
+        err_template = "'__init__' must be a normal method; got 'FunctionKind.{}'!"
+        annotations = {
+            "@classmethod": "CLASS_METHOD",
+            "@staticmethod": "STATIC_METHOD",
+            "@getter": "GETTER",
+        }
+        for annotation, invalid_kind in annotations.items():
+            with self.subTest(annotation=annotation, invalid_kind=invalid_kind):
                 block = f"""
                     module foo
                     class Foo "" ""
                     {annotation}
                     Foo.__init__
                 """
-                self.expect_failure(block, err, lineno=3)
+                expected_error = err_template.format(invalid_kind)
+                self.expect_failure(block, expected_error, lineno=3)
 
     def test_duplicate_coexist(self):
         err = "Called @coexist twice"
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -5457,8 +5457,8 @@ def update_function_kind(self, fullname: str) -> None:
                 self.kind = METHOD_INIT
             else:
                 fail(
-                    "'__init__' must be a normal method, "
-                    "not a classmethod, staticmethod or getter!"
+                    "'__init__' must be a normal method; "
+                    f"got '{self.kind}'!"
                 )
 
     def state_modulename_name(self, line: str) -> None:
