Merge pull request #188 from plugwise/fix_187

Fix for #187

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.18.2: Smile: fix for https://github.com/plugwise/python-plugwise/issues/187
+
 # v0.18.1: Smile Adam: don't show vacation-preset, as not shown in the Plugwise App or on the local Adam-website
 
 # v0.18.0: Smile: add generation of cooling-schedules

plugwise/__init__.py

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

plugwise/helper.py

@@ -7,13 +7,7 @@
 import datetime as dt
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
-from aiohttp import (
-    BasicAuth,
-    ClientResponse,
-    ClientSession,
-    ClientTimeout,
-    ServerTimeoutError,
-)
+from aiohttp import BasicAuth, ClientError, ClientResponse, ClientSession, ClientTimeout
 from dateutil.parser import parse
 from defusedxml import ElementTree as etree
 from munch import Munch
@@ -54,9 +48,9 @@
     ThermoLoc,
 )
 from .exceptions import (
-    DeviceTimeoutError,
     InvalidAuthentication,
     InvalidXMLError,
+    PlugwiseException,
     ResponseError,
 )
 from .util import (
@@ -266,12 +260,12 @@ async def _request(
                     data=data,
                     auth=self._auth,
                 )
-        except ServerTimeoutError:
+        except ClientError as err:  # ClientError is an ancestor class of ServerTimeoutError
             if retry < 1:
-                LOGGER.error("Timed out sending %s command to Plugwise", command)
-                raise DeviceTimeoutError(
-                    "Plugwise timeout error, check log for more info."
-                )
+                LOGGER.error("Failed sending %s %s to Plugwise Smile", method, command)
+                raise PlugwiseException(
+                    "Plugwise connection error, check log for more info."
+                ) from err
             return await self._request(command, retry - 1)
 
         return await self._request_validate(resp, method)

tests/test_smile.py

@@ -3853,7 +3853,7 @@ async def test_connect_timeout(self, timeout_test):
                 client,
             ) = await self.connect_wrapper()
             assert False  # pragma: no cover
-        except pw_exceptions.DeviceTimeoutError:
+        except pw_exceptions.PlugwiseException:
             assert True
 
     class PlugwiseTestError(Exception):