gh-113299: Move cpp.py into libclinic (#113526)

diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
index 3d6816d73d45bc5b21ddf30f4ea0466b83668dac..7323bdd801f4be0aca53086b08c3d818469e3631 100644 (file)
--- a/Lib/test/test_clinic.py
+++ b/Lib/test/test_clinic.py
@@ -3920,7 +3920,7 @@ class ClinicReprTests(unittest.TestCase):
         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 82efff56eda756fa2cd6be39f5ec03c6b5dd583f..f6f95580f1a177ab0f9322d9cd85244af2ccb52e 100755 (executable)
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -13,7 +13,6 @@ import builtins as bltns
 import collections
 import contextlib
 import copy
-import cpp
 import dataclasses as dc
 import enum
 import functools
@@ -53,6 +52,7 @@ from typing import (
 
 # 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 659099056cd46cda97bec8cb49dd0b5221ffbcdd..e115d65a88e1b6022c05207a45346f096f755b75 100644 (file)
--- a/Tools/clinic/cpp.py
+++ b/Tools/clinic/libclinic/cpp.py
@@ -3,7 +3,10 @@ import re
 import sys
 from typing import NoReturn
 
-from libclinic.errors import ParseError
+from .errors import ParseError
+
+
+__all__ = ["Monitor"]
 
 
 TokenAndCondition = tuple[str, str]