Use Python 3.9 generic collections type hints in generated code

igo95862 · igo95862 · commit fd98d9b6614f · 2025-04-05T18:38:07.000+01:00
Since Python 3.9 is now a minimal version the `list`, `dict` and
`tuple` type hints can now be used instead of `typing.List`...
diff --git a/src/sdbus/interface_generator.py b/src/sdbus/interface_generator.py
@@ -136,7 +136,7 @@ def typing_basic(cls, char: str) -> str:
 
     @staticmethod
     def typing_into_tuple(typing_iter: Iterable[str]) -> str:
-        return f"Tuple[{', '.join(typing_iter)}]"
+        return f"tuple[{', '.join(typing_iter)}]"
 
     @staticmethod
     def slice_container(dbus_sig_iter: Iterator[str], peek_str: str) -> str:
@@ -219,7 +219,7 @@ def typing_complete(cls, complete_sig: str) -> str:
             dict_value_sig = complete_sig[3:-1]
             dict_value_typing = cls.typing_complete(dict_value_sig)
 
-            return f"Dict[{dict_key_typing}, {dict_value_typing}]"
+            return f"dict[{dict_key_typing}, {dict_value_typing}]"
 
         elif complete_sig.startswith('a'):
             array_completes = cls.split_sig(complete_sig[1:])
@@ -230,7 +230,7 @@ def typing_complete(cls, complete_sig: str) -> str:
 
             array_single_complete = array_completes[0]
 
-            return f"List[{cls.typing_complete(array_single_complete)}]"
+            return f"list[{cls.typing_complete(array_single_complete)}]"
         elif complete_sig.startswith('('):
             if complete_sig[-1] != ')':
                 raise ValueError(f"Malformed struct {complete_sig}")
@@ -618,7 +618,7 @@ def has_members(self) -> bool:
     "generic_header": """\
 from __future__ import annotations
 
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 """,
     "async_imports_header": """from sdbus import (
diff --git a/test/test_interface_generator.py b/test/test_interface_generator.py
@@ -112,7 +112,7 @@ def test_signature_to_typing(self) -> None:
 
         with self.subTest('Parse variant'):
             self.assertEqual(
-                'Tuple[str, Any]', DbusSigToTyping.typing_complete('v')
+                'tuple[str, Any]', DbusSigToTyping.typing_complete('v')
             )
 
         with self.subTest('Splitter test'):
@@ -124,40 +124,40 @@ def test_signature_to_typing(self) -> None:
         with self.subTest('Parse struct'):
             self.assertEqual(
                 DbusSigToTyping.typing_complete('(sx)'),
-                'Tuple[str, int]',
+                'tuple[str, int]',
             )
 
         with self.subTest('Parse list'):
             self.assertEqual(
                 DbusSigToTyping.typing_complete('a(sx)'),
-                'List[Tuple[str, int]]',
+                'list[tuple[str, int]]',
             )
 
         with self.subTest('Parse dict'):
             self.assertEqual(
                 DbusSigToTyping.typing_complete('a{s(xh)}'),
-                'Dict[str, Tuple[int, int]]',
+                'dict[str, tuple[int, int]]',
             )
 
         with self.subTest('Parse signature'):
             self.assertEqual(
                 DbusSigToTyping.sig_to_typing('a{s(xh)}'),
-                'Dict[str, Tuple[int, int]]',
+                'dict[str, tuple[int, int]]',
             )
 
             self.assertEqual(
                 DbusSigToTyping.sig_to_typing('a{s(xh)}xs'),
-                'Tuple[Dict[str, Tuple[int, int]], int, str]',
+                'tuple[dict[str, tuple[int, int]], int, str]',
             )
 
             self.assertEqual(
                 DbusSigToTyping.sig_to_typing('a{s(xh)}xs'),
-                'Tuple[Dict[str, Tuple[int, int]], int, str]',
+                'tuple[dict[str, tuple[int, int]], int, str]',
             )
 
             self.assertEqual(
                 DbusSigToTyping.sig_to_typing('as'),
-                'List[str]',
+                'list[str]',
             )
 
             self.assertEqual(
