Fix type annotations

Remove duplicated declaration of "clinic" global variable.

Author: vstinner

Lib/test/test_clinic.py

@@ -830,11 +830,10 @@ class ClinicBlockParserTest(TestCase):
     def _test(self, input, output):
         language = clinic.CLanguage(None)
 
-        clinic_arg = None  # mock Clinic, not used here
         blocks = list(clinic.BlockParser(input, language))
         writer = clinic.BlockPrinter(language)
         for block in blocks:
-            writer.print_block(block, clinic_arg)
+            writer.print_block(block)
         output = writer.f.getvalue()
         assert output == input, "output != input!\n\noutput " + repr(output) + "\n\n input " + repr(input)
 

Tools/clinic/clinic.py

@@ -2115,9 +2115,10 @@ class BlockPrinter:
     def print_block(
             self,
             block: Block,
-            clinic: Clinic,
             *,
-            core_includes: bool = False
+            core_includes: bool = False,
+            # needed if core_includes is true
+            clinic: Clinic | None = None,
     ) -> None:
         input = block.input
         output = block.output
@@ -2146,7 +2147,7 @@ def print_block(
         write("\n")
 
         output = ''
-        if core_includes:
+        if core_includes and clinic:
             output += textwrap.dedent("""
                 #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
                 #  include "pycore_gc.h"            // PyGC_Head
@@ -2303,7 +2304,7 @@ def __init__(self, clinic: Clinic) -> None: ...
     def parse(self, block: Block) -> None: ...
 
 
-clinic = None
+clinic : Clinic | None = None
 class Clinic:
 
     presets_text = """
@@ -2430,7 +2431,7 @@ def __init__(
         global clinic
         clinic = self
 
-    def add_include(self, name: str, reason: str):
+    def add_include(self, name: str, reason: str) -> None:
         if name in self.includes:
             return
         self.includes[name] = reason
@@ -2470,7 +2471,7 @@ def parse(self, input: str) -> str:
                     self.parsers[dsl_name] = parsers[dsl_name](self)
                 parser = self.parsers[dsl_name]
                 parser.parse(block)
-            printer.print_block(block, clinic)
+            printer.print_block(block)
 
         # these are destinations not buffers
         for name, destination in self.destinations.items():
@@ -2485,7 +2486,7 @@ def parse(self, input: str) -> str:
                     block.input = "dump " + name + "\n"
                     warn("Destination buffer " + repr(name) + " not empty at end of file, emptying.")
                     printer.write("\n")
-                    printer.print_block(block, clinic)
+                    printer.print_block(block)
                     continue
 
                 if destination.type == 'file':
@@ -2510,7 +2511,7 @@ def parse(self, input: str) -> str:
 
                     block.input = 'preserve\n'
                     printer_2 = BlockPrinter(self.language)
-                    printer_2.print_block(block, clinic, core_includes=True)
+                    printer_2.print_block(block, core_includes=True, clinic=self)
                     write_file(destination.filename, printer_2.f.getvalue())
                     continue
 
@@ -3362,7 +3363,7 @@ def parser_name(self) -> str:
         else:
             return self.name
 
-    def add_include(self, name, reason):
+    def add_include(self, name: str, reason: str) -> None:
         if self.include:
             raise ValueError("a converter only supports a single include")
         self.include = (name, reason)
@@ -5987,9 +5988,6 @@ def do_post_block_processing_cleanup(self, lineno: int) -> None:
 }
 
 
-clinic = None
-
-
 def create_cli() -> argparse.ArgumentParser:
     cmdline = argparse.ArgumentParser(
         prog="clinic.py",