Merge pull request #19 from plugwise/merge-exceptions

Merge Exception Class

Author: bouwew

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.8.0a5"
+__version__ = "0.8.0a6"
 
 from plugwise.smile import Smile
 from plugwise.stick import stick

plugwise/constants.py

@@ -1,3 +1,5 @@
+""" Plugwise Stick and Smile constants."""
+
 ### Stick constants ###
 
 UTF8_DECODE = "utf-8"
@@ -327,40 +329,14 @@
 }
 
 SMILES = {
-    "smile_open_therm_v3": {
-        "type": "thermostat",
-        "friendly_name": "Adam",
-    },
-    "smile_open_therm_v2": {
-        "type": "thermostat",
-        "friendly_name": "Adam",
-    },
-    "smile_thermo_v4": {
-        "type": "thermostat",
-        "friendly_name": "Anna",
-    },
-    "smile_thermo_v3": {
-        "type": "thermostat",
-        "friendly_name": "Anna",
-    },
-    "smile_thermo_v1": {
-        "type": "thermostat",
-        "friendly_name": "Anna",
-        "legacy": True,
-    },
-    "smile_v4": {
-        "type": "power",
-        "friendly_name": "P1",
-    },
-    "smile_v3": {
-        "type": "power",
-        "friendly_name": "P1",
-    },
-    "smile_v2": {
-        "type": "power",
-        "friendly_name": "P1",
-        "legacy": True,
-    },
+    "smile_open_therm_v3": {"type": "thermostat", "friendly_name": "Adam",},
+    "smile_open_therm_v2": {"type": "thermostat", "friendly_name": "Adam",},
+    "smile_thermo_v4": {"type": "thermostat", "friendly_name": "Anna",},
+    "smile_thermo_v3": {"type": "thermostat", "friendly_name": "Anna",},
+    "smile_thermo_v1": {"type": "thermostat", "friendly_name": "Anna", "legacy": True,},
+    "smile_v4": {"type": "power", "friendly_name": "P1",},
+    "smile_v3": {"type": "power", "friendly_name": "P1",},
+    "smile_v2": {"type": "power", "friendly_name": "P1", "legacy": True,},
     "stretch_v3": {"type": "stretch", "friendly_name": "Stretch", "legacy": True},
     "stretch_v2": {"type": "stretch", "friendly_name": "Stretch", "legacy": True},
 }

plugwise/exceptions.py

@@ -1,108 +1,71 @@
-# Copyright (C) 2011 Sven Petai <[email protected]>
-# Use of this source code is governed by the MIT license found in the LICENSE file.
+""" Copyright (C) 2011 Sven Petai <[email protected]>, use of this source code is governed by the MIT license found in the LICENSE file."""
 
-### Stick exceptions ###
 
 class PlugwiseException(Exception):
     """Base error class for this Plugwise library"""
 
-    pass
+
+### Stick exceptions ###
 
 
 class PortError(PlugwiseException):
     """Connection to USBstick failed"""
 
-    pass
-
 
 class StickInitError(PlugwiseException):
     """Initialization of USBstick failed"""
 
-    pass
-
 
 class NetworkDown(PlugwiseException):
     """Zigbee network not online"""
 
-    pass
-
 
 class CirclePlusError(PlugwiseException):
     """Connection to Circle+ node failed"""
 
-    pass
-
 
 class ProtocolError(PlugwiseException):
     """Error while decode received data"""
 
-    pass
-
 
 class TimeoutException(PlugwiseException):
     """Timeout expired while waiting for response from node"""
 
-    pass
-
 
 ### Smile exceptions ###
 
 
-class PlugwiseError(Exception):
-    """Plugwise exceptions class."""
-
-    pass
-
-
-class ConnectionFailedError(PlugwiseError):
+class ConnectionFailedError(PlugwiseException):
     """Raised when unable to connect."""
 
-    pass
-
 
-class InvalidAuthentication(PlugwiseError):
+class InvalidAuthentication(PlugwiseException):
     """Raised when unable to authenticate."""
 
-    pass
-
 
-class UnsupportedDeviceError(PlugwiseError):
+class UnsupportedDeviceError(PlugwiseException):
     """Raised when device is not supported."""
 
-    pass
 
-
-class DeviceSetupError(PlugwiseError):
+class DeviceSetupError(PlugwiseException):
     """Raised when device is missing critical setup data."""
 
-    pass
-
 
-class DeviceTimeoutError(PlugwiseError):
+class DeviceTimeoutError(PlugwiseException):
     """Raised when device is not supported."""
 
-    pass
 
-
-class ErrorSendingCommandError(PlugwiseError):
+class ErrorSendingCommandError(PlugwiseException):
     """Raised when device is not accepting the command."""
 
-    pass
-
 
-class ResponseError(PlugwiseError):
+class ResponseError(PlugwiseException):
     """Raised when empty or error in response returned."""
 
-    pass
-
 
-class InvalidXMLError(PlugwiseError):
+class InvalidXMLError(PlugwiseException):
     """Raised when response holds incomplete or invalid XML data."""
 
-    pass
 
-
-class XMLDataMissingError(PlugwiseError):
+class XMLDataMissingError(PlugwiseException):
     """Raised when xml data is empty."""
-
-    pass

plugwise/smile.py

@@ -105,7 +105,6 @@ async def _create_session() -> aiohttp.ClientSession:
 
     async def connect(self):
         """Connect to Plugwise device."""
-        # pylint: disable=too-many-return-statements,raise-missing-from
         names = []
 
         result = await self.request(DOMAIN_OBJECTS)
@@ -211,16 +210,9 @@ async def close_connection(self):
         await self.websession.close()
 
     async def request(
-        self,
-        command,
-        retry=3,
-        method="get",
-        data=None,
-        headers=None,
+        self, command, retry=3, method="get", data=None, headers=None,
     ):
         """Request data."""
-        # pylint: disable=too-many-return-statements,raise-missing-from
-
         resp = None
         url = f"{self._endpoint}{command}"
 

plugwise/util.py

@@ -65,10 +65,12 @@ def int_to_uint(val, octals):
         val = val + (1 << bits)
     return val
 
+
 def escape_illegal_xml_characters(xmldata):
     """Replace illegal &-characters."""
     return re.sub(r"&([^a-zA-Z#])", r"&amp;\1", xmldata)
 
+
 def format_measure(measure):
     """Format measure to correct type."""
     try:
@@ -88,6 +90,7 @@ def format_measure(measure):
                 measure = False
     return measure
 
+
 def determine_selected(available, selected, schemas):
     """Determine selected schema from available schemas."""
     for schema_a, schema_b in schemas.items():
@@ -96,6 +99,7 @@ def determine_selected(available, selected, schemas):
             selected = schema_a
     return available, selected
 
+
 def in_between(now, start, end):
     """Determine timing for schedules."""
     if start <= end:
@@ -267,9 +271,7 @@ def __init__(self, hour=0, minute=0, second=0):
     def deserialize(self, val):
         CompositeType.deserialize(self, val)
         self.value = datetime.time(
-            int(self.hour.value),
-            int(self.minute.value),
-            int(self.second.value),
+            int(self.hour.value), int(self.minute.value), int(self.second.value),
         )