gh-108494: AC: change parse_file() API

vstinner · vstinner · commit 0b1ae979c055 · 2023-08-28T18:16:34.000+02:00
Revert my change adding 'ns' parameter, add back 'verify' parameter,
and add also 'limited_capi' parameter.
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
@@ -22,13 +22,6 @@
     from clinic import DSLParser
 
 
-def default_namespace():
-    ns = types.SimpleNamespace()
-    ns.force = False
-    ns.limited_capi = clinic.DEFAULT_LIMITED_CAPI
-    return ns
-
-
 def _make_clinic(*, filename='clinic_tests'):
     clang = clinic.CLanguage(None)
     c = clinic.Clinic(clang, filename=filename)
@@ -704,9 +697,8 @@ def expect_parsing_failure(
         self, *, filename, expected_error, verify=True, output=None
     ):
         errmsg = re.escape(dedent(expected_error).strip())
-        ns = default_namespace()
         with self.assertRaisesRegex(clinic.ClinicError, errmsg):
-            clinic.parse_file(filename, ns=ns)
+            clinic.parse_file(filename)
 
     def test_parse_file_no_extension(self) -> None:
         self.expect_parsing_failure(
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -2612,11 +2612,10 @@ def __repr__(self) -> str:
 def parse_file(
         filename: str,
         *,
-        ns: argparse.Namespace,
         output: str | None = None,
+        verify: bool = True,
+        limited_capi: bool = DEFAULT_LIMITED_CAPI,
 ) -> None:
-    verify = not ns.force
-    limited_capi = ns.limited_capi
     if not output:
         output = filename
 
@@ -6190,7 +6189,8 @@ def run_clinic(parser: argparse.ArgumentParser, ns: argparse.Namespace) -> None:
                     continue
                 if ns.verbose:
                     print(path)
-                parse_file(path, ns=ns)
+                parse_file(path,
+                           verify=not ns.force, limited_capi=ns.limited_capi)
         return
 
     if not ns.filename:
@@ -6202,7 +6202,8 @@ def run_clinic(parser: argparse.ArgumentParser, ns: argparse.Namespace) -> None:
     for filename in ns.filename:
         if ns.verbose:
             print(filename)
-        parse_file(filename, output=ns.output, ns=ns)
+        parse_file(filename, output=ns.output,
+                   verify=not ns.force, limited_capi=ns.limited_capi)
 
 
 def main(argv: list[str] | None = None) -> NoReturn:
