https://github.com/python/cpython/commit/7ab9efdd6a2fb21cddca1ccd70175f1ac6b... commit: 7ab9efdd6a2fb21cddca1ccd70175f1ac6bd9168 branch: main author: Erlend E. Aasland <erlend@python.org> committer: erlend-aasland <erlend.aasland@protonmail.com> date: 2023-12-28T00:20:57+01:00 summary: gh-113299: Move cpp.py into libclinic (#113526) files: A Tools/clinic/libclinic/cpp.py D Tools/clinic/cpp.py M Lib/test/test_clinic.py M Tools/clinic/clinic.py diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py index 3d6816d73d45bc..7323bdd801f4be 100644 --- a/Lib/test/test_clinic.py +++ b/Lib/test/test_clinic.py @@ -3920,7 +3920,7 @@ def test_Function_and_Parameter_reprs(self): self.assertEqual(repr(parameter), "<clinic.Parameter 'bar'>") def test_Monitor_repr(self): - monitor = clinic.cpp.Monitor("test.c") + monitor = libclinic.cpp.Monitor("test.c") self.assertRegex(repr(monitor), r"<clinic.Monitor \d+ line=0 condition=''>") monitor.line_number = 42 diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 82efff56eda756..f6f95580f1a177 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -13,7 +13,6 @@ import collections import contextlib import copy -import cpp import dataclasses as dc import enum import functools @@ -53,6 +52,7 @@ # Local imports. import libclinic +import libclinic.cpp from libclinic import ClinicError @@ -648,7 +648,7 @@ class CLanguage(Language): def __init__(self, filename: str) -> None: super().__init__(filename) - self.cpp = cpp.Monitor(filename) + self.cpp = libclinic.cpp.Monitor(filename) def parse_line(self, line: str) -> None: self.cpp.writeline(line) diff --git a/Tools/clinic/cpp.py b/Tools/clinic/libclinic/cpp.py similarity index 99% rename from Tools/clinic/cpp.py rename to Tools/clinic/libclinic/cpp.py index 659099056cd46c..e115d65a88e1b6 100644 --- a/Tools/clinic/cpp.py +++ b/Tools/clinic/libclinic/cpp.py @@ -3,7 +3,10 @@ import sys from typing import NoReturn -from libclinic.errors import ParseError +from .errors import ParseError + + +__all__ = ["Monitor"] TokenAndCondition = tuple[str, str]