Clean up smilecomm-related selfs

Author: bouwew

plugwise/__init__.py

@@ -51,19 +51,15 @@ def __init__(
         username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
-        self._host = host
-        self._password = password
-        self._port = port
+
         self._timeout = DEFAULT_LEGACY_TIMEOUT
-        self._username = username
-        self._websession = websession
         super().__init__(
-            self._host,
-            self._password,
-            self._port,
+            host,
+            password,
+            port,
             self._timeout,
-            self._username,
-            self._websession,
+            username,
+            websession,
         )
 
         self._cooling_present = False
@@ -128,10 +124,7 @@ async def connect(self) -> Version | None:
 
         self._smile_api = (
             SmileAPI(
-                self._host,
-                self._password,
                 self._request,
-                self._websession,
                 self._cooling_present,
                 self._elga,
                 self._is_thermostat,
@@ -150,15 +143,10 @@ async def connect(self) -> Version | None:
                 self.smile_name,
                 self.smile_type,
                 self.smile_version,
-                self._port,
-                self._username,
             )
             if not self.smile_legacy
             else SmileLegacyAPI(
-                self._host,
-                self._password,
                 self._request,
-                self._websession,
                 self._is_thermostat,
                 self._loc_data,
                 self._on_off_device,
@@ -173,8 +161,6 @@ async def connect(self) -> Version | None:
                 self.smile_name,
                 self.smile_type,
                 self.smile_zigbee_mac_address,
-                self._port,
-                self._username,
             )
         )
 

plugwise/legacy/smile.py

@@ -11,8 +11,6 @@
 
 from plugwise.constants import (
     APPLIANCES,
-    DEFAULT_PORT,
-    DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
     LOCATIONS,
     LOGGER,
@@ -28,7 +26,6 @@
 from plugwise.exceptions import ConnectionFailedError, DataMissingError, PlugwiseError
 from plugwise.legacy.data import SmileLegacyData
 
-import aiohttp
 from munch import Munch
 from packaging.version import Version
 
@@ -40,10 +37,7 @@ class SmileLegacyAPI(SmileLegacyData):
 
     def __init__(
         self,
-        host: str,
-        password: str,
         request: Callable[..., Awaitable[Any]],
-        websession: aiohttp.ClientSession,
         _is_thermostat: bool,
         _loc_data: dict[str, ThermoLoc],
         _on_off_device: bool,
@@ -58,8 +52,6 @@ def __init__(
         smile_name: str,
         smile_type: str,
         smile_zigbee_mac_address: str | None,
-        port: int = DEFAULT_PORT,
-        username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_present = False

plugwise/smile.py

@@ -13,8 +13,6 @@
     ADAM,
     ANNA,
     APPLIANCES,
-    DEFAULT_PORT,
-    DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
     GATEWAY_REBOOT,
     LOCATIONS,
@@ -31,7 +29,6 @@
 from plugwise.data import SmileData
 from plugwise.exceptions import ConnectionFailedError, DataMissingError, PlugwiseError
 
-import aiohttp
 from defusedxml import ElementTree as etree
 
 # Dict as class
@@ -46,10 +43,7 @@ class SmileAPI(SmileData):
 
     def __init__(
         self,
-        host: str,
-        password: str,
         request: Callable[..., Awaitable[Any]],
-        websession: aiohttp.ClientSession,
         _cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
@@ -68,8 +62,6 @@ def __init__(
         smile_name: str,
         smile_type: str,
         smile_version: Version | None,
-        port: int = DEFAULT_PORT,
-        username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_enabled = False