Skip to content

Commit 46f74b4

Browse files
committed
gh-108494: AC: change parse_file() API
Revert my change adding 'ns' parameter, add back 'verify' parameter, and add also 'limited_capi' parameter.
1 parent 713afb8 commit 46f74b4

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

Lib/test/test_clinic.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@
2222
from clinic import DSLParser
2323

2424

25-
def default_namespace():
26-
ns = types.SimpleNamespace()
27-
ns.force = False
28-
ns.limited_capi = clinic.DEFAULT_LIMITED_CAPI
29-
return ns
30-
31-
3225
def _make_clinic(*, filename='clinic_tests'):
3326
clang = clinic.CLanguage(None)
3427
c = clinic.Clinic(clang, filename=filename)
@@ -704,9 +697,8 @@ def expect_parsing_failure(
704697
self, *, filename, expected_error, verify=True, output=None
705698
):
706699
errmsg = re.escape(dedent(expected_error).strip())
707-
ns = default_namespace()
708700
with self.assertRaisesRegex(clinic.ClinicError, errmsg):
709-
clinic.parse_file(filename, ns=ns)
701+
clinic.parse_file(filename)
710702

711703
def test_parse_file_no_extension(self) -> None:
712704
self.expect_parsing_failure(

Tools/clinic/clinic.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -2593,11 +2593,10 @@ def __repr__(self) -> str:
25932593
def parse_file(
25942594
filename: str,
25952595
*,
2596-
ns: argparse.Namespace,
25972596
output: str | None = None,
2597+
verify: bool = True,
2598+
limited_capi: bool = DEFAULT_LIMITED_CAPI,
25982599
) -> None:
2599-
verify = not ns.force
2600-
limited_capi = ns.limited_capi
26012600
if not output:
26022601
output = filename
26032602

@@ -6158,7 +6157,8 @@ def run_clinic(parser: argparse.ArgumentParser, ns: argparse.Namespace) -> None:
61586157
continue
61596158
if ns.verbose:
61606159
print(path)
6161-
parse_file(path, ns=ns)
6160+
parse_file(path, ns=ns, verify=not ns.force,
6161+
limited_capi=ns.limited_capi)
61626162
return
61636163

61646164
if not ns.filename:
@@ -6170,7 +6170,8 @@ def run_clinic(parser: argparse.ArgumentParser, ns: argparse.Namespace) -> None:
61706170
for filename in ns.filename:
61716171
if ns.verbose:
61726172
print(filename)
6173-
parse_file(filename, output=ns.output, ns=ns)
6173+
parse_file(filename, output=ns.output, ns=ns,
6174+
verify=not ns.force, limited_capi=ns.limited_capi)
61746175

61756176

61766177
def main(argv: list[str] | None = None) -> NoReturn:

0 commit comments

Comments
 (0)