Make instance variables explicit. (#29)

changelog

@@ -1,3 +1,4 @@
+0.7.0a2: make instance variables explicit
 0.7.0a1: support device/entity and standard integrations
 
 0.6.3: restore switch state

custom_components/momentary/__init__.py

@@ -26,7 +26,7 @@
 from .db import Db
 
 
-__version__ = '0.7.0a1'
+__version__ = '0.7.0a2'
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/momentary/db.py

@@ -50,17 +50,15 @@ class Db:
     entries as needed.
     """
 
-    _group_name: str = None
-    _switches_file: str = DB_DEFAULT_SWITCHES_FILE
-    _switches = {}
-    _switches_meta_data = {}
-    _orphaned_switches = {}
-    _changed: bool = False
-
     def __init__(self, group_name: str, file: str):
         self._group_name = group_name
         self._switches_file = file
 
+        self._switches = {}
+        self._switches_meta_data = {}
+        self._orphaned_switches = {}
+        self._changed: bool = False
+
     def _make_original_unique_id(self, name):
         if name.startswith("!"):
             return slugify(name[1:])

custom_components/momentary/manifest.json

@@ -6,6 +6,6 @@
   "dependencies": [],
   "codeowners": ["@sherrell"],
   "requirements": [],
-  "version": "0.7.0a1",
+  "version": "0.7.0a2",
   "iot_class": "local_polling"
 }

custom_components/momentary/switch.py

@@ -76,16 +76,6 @@ async def async_setup_entry(
 class MomentarySwitch(RestoreEntity, SwitchEntity):
     """Representation of a Momentary switch."""
 
-    _uuid: str = ""
-    _mode: str = DEFAULT_MODE
-    _cancellable: bool = DEFAULT_CANCELLABLE
-    _toggle_for: timedelta = DEFAULT_TOGGLE_FOR
-    _toggle_until: datetime = DEFAULT_TOGGLE_UNTIL
-    _idle_state: bool = False
-    _timed_state: bool = True
-    _timer: Callable[[], None] | None = None
-    _hass = None
-
     def __init__(self, uuid, config, hass):
         """Initialize the Momentary switch device."""
 
@@ -102,6 +92,12 @@ def __init__(self, uuid, config, hass):
         self._toggle_for = config.get(CONF_TOGGLE_FOR, DEFAULT_TOGGLE_FOR)
         self._cancellable = config.get(CONF_CANCELLABLE, DEFAULT_CANCELLABLE)
 
+        # Local defaults
+        self._toggle_until = DEFAULT_TOGGLE_UNTIL
+        self._idle_state = False
+        self._timed_state = True
+        self._timer = None
+
         # Old configuration - only turns on
         if self._mode.lower() == DEFAULT_MODE:
             _LOGGER.debug(f'old config, idle-state={self._idle_state}')