Removed unnecessary ClassVar typing for settings

Author: igo95862

sdbus_async/networkmanager/settings/adsl.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class AdslSettings(NetworkManagerSettingsMixin):
     """ADSL Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['password']
+    secret_fields_names = ['password']
     secret_name = 'adsl'
 
     encapsulation: Optional[str] = field(

sdbus_async/networkmanager/settings/cdma.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class CdmaSettings(NetworkManagerSettingsMixin):
     """CDMA-based Mobile Broadband Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['password']
+    secret_fields_names = ['password']
     secret_name = 'cdma'
 
     mtu: Optional[int] = field(

sdbus_async/networkmanager/settings/eapol.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import List, Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class EapolSettings(NetworkManagerSettingsMixin):
     """IEEE 802.1x Authentication Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['ca_cert_password', 'client_cert_password', 'password', 'password_raw', 'phase2_ca_cert_password', 'phase2_client_cert_password', 'phase2_private_key_password', 'pin', 'private_key_password']
+    secret_fields_names = ['ca_cert_password', 'client_cert_password', 'password', 'password_raw', 'phase2_ca_cert_password', 'phase2_client_cert_password', 'phase2_private_key_password', 'pin', 'private_key_password']
     secret_name = '802-1x'
 
     altsubject_matches: Optional[List[str]] = field(

sdbus_async/networkmanager/settings/gsm.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class GsmSettings(NetworkManagerSettingsMixin):
     """GSM-based Mobile Broadband Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['password', 'pin']
+    secret_fields_names = ['password', 'pin']
     secret_name = 'gsm'
 
     apn: Optional[str] = field(

sdbus_async/networkmanager/settings/macsec.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class MacsecSettings(NetworkManagerSettingsMixin):
     """MACSec Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['mka_cak']
+    secret_fields_names = ['mka_cak']
     secret_name = 'macsec'
 
     encrypt: Optional[bool] = field(

sdbus_async/networkmanager/settings/pppoe.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class PppoeSettings(NetworkManagerSettingsMixin):
     """PPP-over-Ethernet Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['password']
+    secret_fields_names = ['password']
     secret_name = 'pppoe'
 
     parent: Optional[str] = field(

sdbus_async/networkmanager/settings/wireguard.py

@@ -3,15 +3,15 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import Any, ClassVar, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 from .base import NetworkManagerSettingsMixin
 from .datatypes import WireguardPeers
 
 
 @dataclass
 class WireguardSettings(NetworkManagerSettingsMixin):
     """WireGuard Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['private_key']
+    secret_fields_names = ['private_key']
     secret_name = 'wireguard'
 
     fwmark: Optional[int] = field(

sdbus_async/networkmanager/settings/wireless_security.py

@@ -3,14 +3,14 @@
 # if possible, please make changes by also updating the script.
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import ClassVar, List, Optional
+from typing import List, Optional
 from .base import NetworkManagerSettingsMixin
 
 
 @dataclass
 class WirelessSecuritySettings(NetworkManagerSettingsMixin):
     """Wi-Fi Security Settings"""
-    secret_fields_names: ClassVar[List[str]] = ['leap_password', 'psk']
+    secret_fields_names = ['leap_password', 'psk']
     secret_name = '802-11-wireless-security'
 
     auth_alg: Optional[str] = field(

tools/generate-settings-dataclasses-jinja.py

@@ -153,10 +153,6 @@ def __init__(self, name: str, description: str, name_upper: str,
     def typing_imports(self) -> Set[str]:
         typing_imports: Set[str] = self.properties_want_imports.copy()
 
-        if self.secret_fields:
-            typing_imports.add('ClassVar')
-            typing_imports.add('List')
-
         return typing_imports
 
     @cached_property

tools/jinja_templates/setting.py.jinja2

@@ -13,7 +13,7 @@ from .datatypes import {{ setting.datatypes_imports|sort|join(', ') }}
 class {{ setting.python_class_name }}(NetworkManagerSettingsMixin):
     """{{ setting.description }}"""
 {%- if setting.secret_fields %}
-    secret_fields_names: ClassVar[List[str]] = ['{{ setting.secret_fields|sort|join("', '") }}']
+    secret_fields_names = ['{{ setting.secret_fields|sort|join("', '") }}']
     secret_name = '{{ setting.name }}'
 {%- endif %}
 {% for property in setting.properties %}