Refactor tools subpackage (part 1 of #749). (#750)

* Add `_write_structbody_commethods`. * Update `TypeNamer`.
enthought · Jan 19, 2025 · 8bf5283 · 8bf5283
1 parent 6b6af74
commit 8bf5283
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/comtypes/tools/codegenerator/codegenerator.py b/comtypes/tools/codegenerator/codegenerator.py
@@ -466,25 +466,33 @@ def StructureBody(self, body: typedesc.StructureBody) -> None:
             self.imports.add("comtypes", "COMMETHOD")
 
             with self.adjust_blank("attribute") as ofi:
-                print(f"{body.struct.name}._methods_ = [", file=ofi)
-                if body.struct.location:
-                    print(f"# {body.struct.location}", file=ofi)
-                for m in methods:
-                    if m.location:
-                        print(f"    # {m.location}", file=ofi)
-                    print(
-                        (
-                            f"    COMMETHOD(\n"
-                            f"        [], \n"
-                            f"        {self._to_type_name(m.returns)},\n"
-                            f"        '{m.name}',\n"
-                        ),
-                        file=ofi,
-                    )
-                    for a in m.iterArgTypes():
-                        print(f"        ([], {self._to_type_name(a)}),\n", file=ofi)
-                        print("    ),", file=ofi)
-                print("]", file=ofi)
+                self._write_structbody_commethods(body, methods, ofi)
+
+    def _write_structbody_commethods(
+        self,
+        body: typedesc.StructureBody,
+        methods: List[typedesc.Method],
+        ofi: io.StringIO,
+    ) -> None:
+        print(f"{body.struct.name}._methods_ = [", file=ofi)
+        if body.struct.location:
+            print(f"# {body.struct.location}", file=ofi)
+        for m in methods:
+            if m.location:
+                print(f"    # {m.location}", file=ofi)
+            print(
+                (
+                    "    COMMETHOD(\n"
+                    "        [],\n"
+                    f"        {self._to_type_name(m.returns)},\n"
+                    f"        '{m.name}',\n"
+                ),
+                file=ofi,
+            )
+            for a in m.iterArgTypes():
+                print(f"        ([], {self._to_type_name(a)}),\n", file=ofi)
+                print("    ),", file=ofi)
+        print("]", file=ofi)
 
     ################################################################
     # top-level typedesc generators

diff --git a/comtypes/tools/codegenerator/helpers.py b/comtypes/tools/codegenerator/helpers.py
@@ -317,7 +317,7 @@ def __call__(self, t: Any) -> str:
                 return f"CFUNCTYPE({', '.join(args)})"
         elif isinstance(t, typedesc.CvQualifiedType):
             # const and volatile are ignored
-            return "%s" % self(t.typ)
+            return f"{self(t.typ)}"
         elif isinstance(t, typedesc.FundamentalType):
             return ctypes_names[t.name]
         elif isinstance(t, typedesc.Structure):
@@ -328,7 +328,7 @@ def __call__(self, t: Any) -> str:
             return "c_int"  # enums are integers
         elif isinstance(t, typedesc.EnumValue):
             if keyword.iskeyword(t.name):
-                return t.name + "_"
+                return f"{t.name}_"
             return t.name
         elif isinstance(t, typedesc.External):
             # t.symbol_name - symbol to generate