Merge pull request #198 from plugwise/error_handling

Change raisetypes to match better to the errortype

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.19.1: Smile & Stretch: line up error handling with Plugwise-beta
+
 # v0.19.0: Smile Adam & Anna: cooling-related updates
 - Anna: replace `setpoint` with `setpoint_low` and `setpoint_high` when cooling is active
 - Anna: update according to recent Anna-with-cooling firmware updates (info provided by Plugwise)

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.19.0"
+__version__ = "0.19.1"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -48,9 +48,9 @@
     ThermoLoc,
 )
 from .exceptions import (
+    ConnectionFailedError,
     InvalidAuthentication,
     InvalidXMLError,
-    PlugwiseError,
     ResponseError,
 )
 from .util import (
@@ -268,8 +268,13 @@ async def _request(
                 )
         except ClientError as err:  # ClientError is an ancestor class of ServerTimeoutError
             if retry < 1:
-                LOGGER.error("Failed sending %s %s to Plugwise Smile", method, command)
-                raise PlugwiseError(
+                LOGGER.error(
+                    "Failed sending %s %s to Plugwise Smile, error: %s",
+                    method,
+                    command,
+                    err,
+                )
+                raise ConnectionFailedError(
                     "Plugwise connection error, check log for more info."
                 ) from err
             return await self._request(command, retry - 1)

plugwise/smile.py

@@ -36,9 +36,9 @@
     SmileSwitches,
 )
 from .exceptions import (
-    ConnectionFailedError,
     InvalidSetupError,
     PlugwiseError,
+    ResponseError,
     UnsupportedDeviceError,
 )
 from .helper import SmileComm, SmileHelper, update_helper
@@ -312,7 +312,7 @@ async def connect(self) -> bool:
                     an issue on http://github.com/plugwise/python-plugwise",
                     result,
                 )
-                raise ConnectionFailedError("Plugwise error, check log for more info.")
+                raise ResponseError("Plugwise error, check log for more info.")
 
         # Check if Anna is connected to an Adam
         if "159.2" in models:
@@ -376,7 +376,7 @@ async def _smile_detect_legacy(self, result: etree, dsmrmain: etree) -> str:
                     "Connected but no gateway device information found, please create \
                      an issue on http://github.com/plugwise/python-plugwise"
                 )
-                raise ConnectionFailedError("Plugwise error, check log for more info.")
+                raise ResponseError("Plugwise error, check log for more info.")
 
         return model