[Python-checkins] gh-104683: clinic.py: refactor four simple classes as dataclasses (#106476)
AlexWaygood
webhook-mailer at python.org
Thu Jul 6 17:17:15 EDT 2023
https://github.com/python/cpython/commit/5548097925b9924ebf761376d632c5198d01ebd5
commit: 5548097925b9924ebf761376d632c5198d01ebd5
branch: main
author: Alex Waygood <Alex.Waygood at Gmail.com>
committer: AlexWaygood <Alex.Waygood at Gmail.com>
date: 2023-07-06T22:17:12+01:00
summary:
gh-104683: clinic.py: refactor four simple classes as dataclasses (#106476)
files:
M Tools/clinic/clinic.py
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 306dca8d44dd2..24d6255f262da 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -13,6 +13,7 @@
import contextlib
import copy
import cpp
+import dataclasses as dc
import enum
import functools
import hashlib
@@ -1858,11 +1859,10 @@ def is_stop_line(line):
return Block(input_output(), dsl_name, output=output)
+ at dc.dataclass(slots=True)
class BlockPrinter:
-
- def __init__(self, language, f=None):
- self.language = language
- self.f = f or io.StringIO()
+ language: Language
+ f: io.StringIO = dc.field(default_factory=io.StringIO)
def print_block(self, block, *, core_includes=False):
input = block.input
@@ -2328,15 +2328,13 @@ def parse(self, block: Block) -> None:
block.output = s.getvalue()
+ at dc.dataclass(repr=False)
class Module:
- def __init__(
- self,
- name: str,
- module = None
- ) -> None:
- self.name = name
- self.module = self.parent = module
+ name: str
+ module: Module | None = None
+ def __post_init__(self) -> None:
+ self.parent = self.module
self.modules: ModuleDict = {}
self.classes: ClassDict = {}
self.functions: list[Function] = []
@@ -2345,22 +2343,16 @@ def __repr__(self) -> str:
return "<clinic.Module " + repr(self.name) + " at " + str(id(self)) + ">"
+ at dc.dataclass(repr=False)
class Class:
- def __init__(
- self,
- name: str,
- module: Module | None = None,
- cls = None,
- typedef: str | None = None,
- type_object: str | None = None
- ) -> None:
- self.name = name
- self.module = module
- self.cls = cls
- self.typedef = typedef
- self.type_object = type_object
- self.parent = cls or module
-
+ name: str
+ module: Module | None = None
+ cls: Class | None = None
+ typedef: str | None = None
+ type_object: str | None = None
+
+ def __post_init__(self) -> None:
+ self.parent = self.cls or self.module
self.classes: ClassDict = {}
self.functions: list[Function] = []
@@ -2606,13 +2598,10 @@ def get_displayname(self, i: int) -> str:
return f'"argument {i}"'
+ at dc.dataclass
class LandMine:
# try to access any
- def __init__(self, message: str) -> None:
- self.__message__ = message
-
- def __repr__(self) -> str:
- return '<LandMine ' + repr(self.__message__) + ">"
+ __message__: str
def __getattribute__(self, name: str):
if name in ('__repr__', '__message__'):
More information about the Python-checkins
mailing list