Fix post-rebase lint and formatting issues

Author: iMicknl

sagemcom_api/action_error_exception_handler.py

@@ -1,14 +1,14 @@
-"""Logic to spot and create ActionErrorExceptions"""
+"""Logic to spot and create ActionErrorExceptions."""
 
 from sagemcom_api.const import (
     XMO_ACCESS_RESTRICTION_ERR,
     XMO_AUTHENTICATION_ERR,
     XMO_LOGIN_RETRY_ERR,
     XMO_MAX_SESSION_COUNT_ERR,
-    XMO_NON_WRITABLE_PARAMETER_ERR,
     XMO_NO_ERR,
+    XMO_NON_WRITABLE_PARAMETER_ERR,
     XMO_REQUEST_ACTION_ERR,
-    XMO_UNKNOWN_PATH_ERR
+    XMO_UNKNOWN_PATH_ERR,
 )
 from sagemcom_api.exceptions import (
     AccessRestrictionException,
@@ -17,32 +17,30 @@
     MaximumSessionCountException,
     NonWritableParameterException,
     UnknownException,
-    UnknownPathException
+    UnknownPathException,
 )
 
 
 class ActionErrorHandler:
-    """Raised when a requested action has an error"""
+    """Raised when a requested action has an error."""
 
     KNOWN_EXCEPTIONS = (
         XMO_AUTHENTICATION_ERR,
         XMO_ACCESS_RESTRICTION_ERR,
         XMO_NON_WRITABLE_PARAMETER_ERR,
         XMO_UNKNOWN_PATH_ERR,
         XMO_MAX_SESSION_COUNT_ERR,
-        XMO_LOGIN_RETRY_ERR
+        XMO_LOGIN_RETRY_ERR,
     )
 
     @staticmethod
     def throw_if(response):
-        """For anywhere that needs the old single-exception behaviour"""
-
+        """For anywhere that needs the old single-exception behaviour."""
         if response["reply"]["error"]["description"] != XMO_REQUEST_ACTION_ERR:
             return
 
         actions = response["reply"]["actions"]
         for action in actions:
-
             action_error = action["error"]
             action_error_desc = action_error["description"]
 
@@ -53,17 +51,12 @@ def throw_if(response):
 
     @staticmethod
     def is_unknown_exception(desc):
-        """
-        True/false if the ActionError is one of our known types
-        """
-
+        """True/false if the ActionError is one of our known types."""
         return False if desc == XMO_NO_ERR else desc not in ActionErrorHandler.KNOWN_EXCEPTIONS
 
     @staticmethod
     def from_error_description(action_error, action_error_desc):
-        """
-        Create the correct exception from an error, for the caller to throw
-        """
+        """Create the correct exception from an error, for the caller to throw."""
         # pylint: disable=too-many-return-statements
 
         if action_error_desc == XMO_AUTHENTICATION_ERR:

sagemcom_api/client.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import hashlib
 import json
 import math
@@ -22,8 +21,8 @@
     ServerDisconnectedError,
     TCPConnector,
 )
-from .action_error_exception_handler import ActionErrorHandler
 
+from .action_error_exception_handler import ActionErrorHandler
 from .const import (
     API_ENDPOINT,
     DEFAULT_TIMEOUT,
@@ -310,7 +309,7 @@ async def login(self):
             response = await self.__api_request_async([actions], True)
             ActionErrorHandler.throw_if(response)
 
-        except asyncio.TimeoutError as exception:
+        except TimeoutError as exception:
             raise LoginTimeoutException(
                 "Login request timed-out. This could be caused by using the wrong encryption method, or using a (non) SSL connection."
             ) from exception
@@ -369,7 +368,6 @@ async def get_encryption_method(self):
         max_tries=1,
         on_backoff=retry_login,
     )
-    async def get_value_by_xpath(self, xpath: str, options: dict | None = None) -> dict:
     async def get_value_by_xpath(
         self,
         xpath: str,
@@ -407,7 +405,6 @@ async def get_value_by_xpath(
         max_tries=1,
         on_backoff=retry_login,
     )
-    async def get_values_by_xpaths(self, xpaths, options: dict | None = None) -> dict:
     async def get_values_by_xpaths(
         self,
         xpaths,
@@ -496,7 +493,7 @@ async def get_device_info(self) -> DeviceInfo:
                     "software_version": "Device/DeviceInfo/SoftwareVersion",
                 },
                 # missing values converted to empty string
-                suppress_action_errors=True
+                suppress_action_errors=True,
             )
             data["manufacturer"] = "Sagemcom"