Fixed tox issues

custom_components/localtuya/common.py

@@ -25,18 +25,18 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import pytuya
 from .const import (
+    ATTR_STATE,
     ATTR_UPDATED_AT,
+    CONF_DEFAULT_VALUE,
     CONF_LOCAL_KEY,
     CONF_MODEL,
+    CONF_PASSIVE_ENTITY,
     CONF_PROTOCOL_VERSION,
+    CONF_RESET_DPIDS,
+    CONF_RESTORE_ON_RECONNECT,
     DATA_CLOUD,
     DOMAIN,
     TUYA_DEVICES,
-    CONF_DEFAULT_VALUE,
-    ATTR_STATE,
-    CONF_RESTORE_ON_RECONNECT,
-    CONF_RESET_DPIDS,
-    CONF_PASSIVE_ENTITY,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/config_flow.py

@@ -34,6 +34,7 @@ from .const import (
     CONF_DPS_STRINGS,
     CONF_EDIT_DEVICE,
     CONF_LOCAL_KEY,
+    CONF_MANUAL_DPS,
     CONF_MODEL,
     CONF_NO_CLOUD,
     CONF_PRODUCT_NAME,
@@ -45,7 +46,6 @@ from .const import (
     DATA_DISCOVERY,
     DOMAIN,
     PLATFORMS,
-    CONF_MANUAL_DPS,
 )
 from .discovery import discover
 
@@ -88,7 +88,9 @@ CONFIGURE_DEVICE_SCHEMA = vol.Schema(
         vol.Required(CONF_LOCAL_KEY): str,
         vol.Required(CONF_HOST): str,
         vol.Required(CONF_DEVICE_ID): str,
-        vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(["3.1", "3.2", "3.3", "3.4"]),
+        vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(
+            ["3.1", "3.2", "3.3", "3.4"]
+        ),
         vol.Optional(CONF_SCAN_INTERVAL): int,
         vol.Optional(CONF_MANUAL_DPS): str,
         vol.Optional(CONF_RESET_DPIDS): str,
@@ -101,7 +103,9 @@ DEVICE_SCHEMA = vol.Schema(
         vol.Required(CONF_DEVICE_ID): cv.string,
         vol.Required(CONF_LOCAL_KEY): cv.string,
         vol.Required(CONF_FRIENDLY_NAME): cv.string,
-        vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(["3.1", "3.2", "3.3", "3.4"]),
+        vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(
+            ["3.1", "3.2", "3.3", "3.4"]
+        ),
         vol.Optional(CONF_SCAN_INTERVAL): int,
         vol.Optional(CONF_MANUAL_DPS): cv.string,
         vol.Optional(CONF_RESET_DPIDS): str,
@@ -144,7 +148,9 @@ def options_schema(entities):
             vol.Required(CONF_FRIENDLY_NAME): str,
             vol.Required(CONF_HOST): str,
             vol.Required(CONF_LOCAL_KEY): str,
-            vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(["3.1", "3.2", "3.3", "3.4"]),
+            vol.Required(CONF_PROTOCOL_VERSION, default="3.3"): vol.In(
+                ["3.1", "3.2", "3.3", "3.4"]
+            ),
             vol.Optional(CONF_SCAN_INTERVAL): int,
             vol.Optional(CONF_MANUAL_DPS): str,
             vol.Optional(CONF_RESET_DPIDS): str,

custom_components/localtuya/fan.py

@@ -27,12 +27,12 @@ from .const import (
     CONF_FAN_DIRECTION,
     CONF_FAN_DIRECTION_FWD,
     CONF_FAN_DIRECTION_REV,
+    CONF_FAN_DPS_TYPE,
     CONF_FAN_ORDERED_LIST,
     CONF_FAN_OSCILLATING_CONTROL,
     CONF_FAN_SPEED_CONTROL,
     CONF_FAN_SPEED_MAX,
     CONF_FAN_SPEED_MIN,
-    CONF_FAN_DPS_TYPE,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/number.py

@@ -7,14 +7,13 @@ from homeassistant.components.number import DOMAIN, NumberEntity
 from homeassistant.const import CONF_DEVICE_CLASS, STATE_UNKNOWN
 
 from .common import LocalTuyaEntity, async_setup_entry
-
 from .const import (
-    CONF_MIN_VALUE,
-    CONF_MAX_VALUE,
     CONF_DEFAULT_VALUE,
+    CONF_MAX_VALUE,
+    CONF_MIN_VALUE,
+    CONF_PASSIVE_ENTITY,
     CONF_RESTORE_ON_RECONNECT,
     CONF_STEPSIZE_VALUE,
-    CONF_PASSIVE_ENTITY,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/pytuya/__init__.py

@@ -58,11 +58,13 @@ __author__ = "rospogrigio"
 _LOGGER = logging.getLogger(__name__)
 
 # Tuya Packet Format
-TuyaHeader = namedtuple('TuyaHeader', 'prefix seqno cmd length')
+TuyaHeader = namedtuple("TuyaHeader", "prefix seqno cmd length")
 MessagePayload = namedtuple("MessagePayload", "cmd payload")
 try:
-    TuyaMessage = namedtuple("TuyaMessage", "seqno cmd retcode payload crc crc_good", defaults=(True,))
-except:
+    TuyaMessage = namedtuple(
+        "TuyaMessage", "seqno cmd retcode payload crc crc_good", defaults=(True,)
+    )
+except Exception:
     TuyaMessage = namedtuple("TuyaMessage", "seqno cmd retcode payload crc crc_good")
 
 # TinyTuya Error Response Codes
@@ -99,8 +101,16 @@ error_codes = {
     None: "Unknown Error",
 }
 
+
+class DecodeError(Exception):
+    """Specific Exception caused by decoding error."""
+
+    pass
+
+
 # Tuya Command Types
-# Reference: https://github.com/tuya/tuya-iotos-embeded-sdk-wifi-ble-bk7231n/blob/master/sdk/include/lan_protocol.h
+# Reference:
+# https://github.com/tuya/tuya-iotos-embeded-sdk-wifi-ble-bk7231n/blob/master/sdk/include/lan_protocol.h
 AP_CONFIG = 0x01  # FRM_TP_CFG_WF      # only used for ap 3.0 network config
 ACTIVE = 0x02  # FRM_TP_ACTV (discard) # WORK_MODE_CMD
 SESS_KEY_NEG_START = 0x03  # FRM_SECURITY_TYPE3 # negotiate session key
@@ -110,12 +120,12 @@ UNBIND          = 0x06  # FRM_TP_UNBIND_DEV  # DATA_QUERT_CMD - issue command
 CONTROL = 0x07  # FRM_TP_CMD         # STATE_UPLOAD_CMD
 STATUS = 0x08  # FRM_TP_STAT_REPORT # STATE_QUERY_CMD
 HEART_BEAT = 0x09  # FRM_TP_HB
-DP_QUERY        = 0x0a # 10 # FRM_QUERY_STAT      # UPDATE_START_CMD - get data points
-QUERY_WIFI      = 0x0b # 11 # FRM_SSID_QUERY (discard) # UPDATE_TRANS_CMD
-TOKEN_BIND      = 0x0c # 12 # FRM_USER_BIND_REQ   # GET_ONLINE_TIME_CMD - system time (GMT)
-CONTROL_NEW     = 0x0d # 13 # FRM_TP_NEW_CMD      # FACTORY_MODE_CMD
-ENABLE_WIFI     = 0x0e # 14 # FRM_ADD_SUB_DEV_CMD # WIFI_TEST_CMD
-WIFI_INFO       = 0x0f # 15 # FRM_CFG_WIFI_INFO
+DP_QUERY = 0x0A  # 10 # FRM_QUERY_STAT      # UPDATE_START_CMD - get data points
+QUERY_WIFI = 0x0B  # 11 # FRM_SSID_QUERY (discard) # UPDATE_TRANS_CMD
+TOKEN_BIND = 0x0C  # 12 # FRM_USER_BIND_REQ   # GET_ONLINE_TIME_CMD - system time (GMT)
+CONTROL_NEW = 0x0D  # 13 # FRM_TP_NEW_CMD      # FACTORY_MODE_CMD
+ENABLE_WIFI = 0x0E  # 14 # FRM_ADD_SUB_DEV_CMD # WIFI_TEST_CMD
+WIFI_INFO = 0x0F  # 15 # FRM_CFG_WIFI_INFO
 DP_QUERY_NEW = 0x10  # 16 # FRM_QUERY_STAT_NEW
 SCENE_EXECUTE = 0x11  # 17 # FRM_SCENE_EXEC
 UPDATEDPS = 0x12  # 18 # FRM_LAN_QUERY_DP    # Request refresh of DPS
@@ -141,7 +151,15 @@ PREFIX_VALUE = 0x000055AA
 PREFIX_BIN = b"\x00\x00U\xaa"
 SUFFIX_VALUE = 0x0000AA55
 SUFFIX_BIN = b"\x00\x00\xaaU"
-NO_PROTOCOL_HEADER_CMDS = [DP_QUERY, DP_QUERY_NEW, UPDATEDPS, HEART_BEAT, SESS_KEY_NEG_START, SESS_KEY_NEG_RESP, SESS_KEY_NEG_FINISH ]
+NO_PROTOCOL_HEADER_CMDS = [
+    DP_QUERY,
+    DP_QUERY_NEW,
+    UPDATEDPS,
+    HEART_BEAT,
+    SESS_KEY_NEG_START,
+    SESS_KEY_NEG_RESP,
+    SESS_KEY_NEG_FINISH,
+]
 
 HEARTBEAT_INTERVAL = 10
 
@@ -193,13 +211,11 @@ payload_dict = {
     "v3.4": {
         CONTROL: {
             "command_override": CONTROL_NEW,  # Uses CONTROL_NEW command
-            "command": {"protocol":5, "t": "int", "data": ""}
+            "command": {"protocol": 5, "t": "int", "data": ""},
         },
         DP_QUERY: {"command_override": DP_QUERY_NEW},
+    },
 }
-}
-
-
 
 
 class TuyaLoggingAdapter(logging.LoggerAdapter):
@@ -262,9 +278,7 @@ def pack_message(msg,hmac_key=None):
     else:
         crc = binascii.crc32(buffer) & 0xFFFFFFFF
     # Calculate CRC, add it together with suffix
-    buffer += struct.pack(
-        end_fmt, crc, SUFFIX_VALUE
-    )
+    buffer += struct.pack(end_fmt, crc, SUFFIX_VALUE)
     return buffer
 
 
@@ -278,42 +292,66 @@ def unpack_message(data, hmac_key=None, header=None, no_retcode=False, logger=No
     headret_len = header_len + retcode_len
 
     if len(data) < headret_len + end_len:
-        logger.debug('unpack_message(): not enough data to unpack header! need %d but only have %d', headret_len+end_len, len(data))
-        raise DecodeError('Not enough data to unpack header')
+        logger.debug(
+            "unpack_message(): not enough data to unpack header! need %d but only have %d",
+            headret_len + end_len,
+            len(data),
+        )
+        raise DecodeError("Not enough data to unpack header")
 
     if header is None:
         header = parse_header(data)
 
     if len(data) < header_len + header.length:
-        logger.debug('unpack_message(): not enough data to unpack payload! need %d but only have %d', header_len+header.length, len(data))
-        raise DecodeError('Not enough data to unpack payload')
+        logger.debug(
+            "unpack_message(): not enough data to unpack payload! need %d but only have %d",
+            header_len + header.length,
+            len(data),
+        )
+        raise DecodeError("Not enough data to unpack payload")
 
-    retcode = 0 if no_retcode else struct.unpack(MESSAGE_RETCODE_FMT, data[header_len:headret_len])[0]
+    retcode = (
+        0
+        if no_retcode
+        else struct.unpack(MESSAGE_RETCODE_FMT, data[header_len:headret_len])[0]
+    )
     # the retcode is technically part of the payload, but strip it as we do not want it here
     payload = data[header_len + retcode_len : header_len + header.length]
     crc, suffix = struct.unpack(end_fmt, payload[-end_len:])
 
     if hmac_key:
-        have_crc = hmac.new(hmac_key, data[:(header_len+header.length)-end_len], sha256).digest()
+        have_crc = hmac.new(
+            hmac_key, data[: (header_len + header.length) - end_len], sha256
+        ).digest()
     else:
-        have_crc = binascii.crc32(data[:(header_len+header.length)-end_len]) & 0xFFFFFFFF
+        have_crc = (
+            binascii.crc32(data[: (header_len + header.length) - end_len]) & 0xFFFFFFFF
+        )
 
     if suffix != SUFFIX_VALUE:
-        logger.debug('Suffix prefix wrong! %08X != %08X', suffix, SUFFIX_VALUE)
+        logger.debug("Suffix prefix wrong! %08X != %08X", suffix, SUFFIX_VALUE)
 
     if crc != have_crc:
         if hmac_key:
-            logger.debug('HMAC checksum wrong! %r != %r', binascii.hexlify(have_crc), binascii.hexlify(crc))
+            logger.debug(
+                "HMAC checksum wrong! %r != %r",
+                binascii.hexlify(have_crc),
+                binascii.hexlify(crc),
+            )
         else:
-            logger.debug('CRC wrong! %08X != %08X', have_crc, crc)
+            logger.debug("CRC wrong! %08X != %08X", have_crc, crc)
+
+    return TuyaMessage(
+        header.seqno, header.cmd, retcode, payload[:-end_len], crc, crc == have_crc
+    )
 
-    return TuyaMessage(header.seqno, header.cmd, retcode, payload[:-end_len], crc, crc == have_crc)
 
 def parse_header(data):
+    """Unpack bytes into a TuyaHeader."""
     header_len = struct.calcsize(MESSAGE_HEADER_FMT)
 
     if len(data) < header_len:
-        raise DecodeError('Not enough data to unpack header')
+        raise DecodeError("Not enough data to unpack header")
 
     prefix, seqno, cmd, payload_len = struct.unpack(
         MESSAGE_HEADER_FMT, data[:header_len]
@@ -321,11 +359,14 @@ def parse_header(data):
 
     if prefix != PREFIX_VALUE:
         # self.debug('Header prefix wrong! %08X != %08X', prefix, PREFIX_VALUE)
-        raise DecodeError('Header prefix wrong! %08X != %08X' % (prefix, PREFIX_VALUE))
+        raise DecodeError("Header prefix wrong! %08X != %08X" % (prefix, PREFIX_VALUE))
 
     # sanity check. currently the max payload length is somewhere around 300 bytes
     if payload_len > 1000:
-        raise DecodeError('Header claims the packet size is over 1000 bytes!  It is most likely corrupt.  Claimed size: %d bytes' % payload_len)
+        raise DecodeError(
+            "Header claims the packet size is over 1000 bytes! It is most likely corrupt. Claimed size: %d bytes"
+            % payload_len
+        )
 
     return TuyaHeader(prefix, seqno, cmd, payload_len)
 
@@ -341,7 +382,8 @@ class AESCipher:
     def encrypt(self, raw, use_base64=True, pad=True):
         """Encrypt data to be sent to device."""
         encryptor = self.cipher.encryptor()
-        if pad: raw = self._pad(raw)
+        if pad:
+            raw = self._pad(raw)
         crypted_text = encryptor.update(raw) + encryptor.finalize()
         return base64.b64encode(crypted_text) if use_base64 else crypted_text
 
@@ -373,13 +415,13 @@ class MessageDispatcher(ContextualLogger):
     RESET_SEQNO = -101
     SESS_KEY_SEQNO = -102
 
-    def __init__(self, dev_id, listener, version, local_key):
+    def __init__(self, dev_id, listener, protocol_version, local_key):
         """Initialize a new MessageBuffer."""
         super().__init__()
         self.buffer = b""
         self.listeners = {}
         self.listener = listener
-        self.version = version
+        self.version = protocol_version
         self.local_key = local_key
         self.set_logger(_LOGGER, dev_id)
 
@@ -420,7 +462,9 @@ class MessageDispatcher(ContextualLogger):
 
             header = parse_header(self.buffer)
             hmac_key = self.local_key if self.version == 3.4 else None
-            msg = unpack_message(self.buffer, header=header, hmac_key=hmac_key, logger=self);
+            msg = unpack_message(
+                self.buffer, header=header, hmac_key=hmac_key, logger=self
+            )
             self.buffer = self.buffer[header_len - 4 + header.length :]
             self._dispatch(msg)
 
@@ -514,7 +558,6 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
         self.id = dev_id
         self.local_key = local_key.encode("latin1")
         self.real_local_key = self.local_key
-        self.version = protocol_version
         self.dev_type = "type_0a"
         self.dps_to_request = {}
         self.cipher = AESCipher(self.local_key)
@@ -525,6 +568,8 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
         self.on_connected = on_connected
         self.heartbeater = None
         self.dps_cache = {}
+        self.local_nonce = b"0123456789abcdef"  # not-so-random random key
+        self.remote_nonce = b""
 
         if protocol_version:
             self.set_version(float(protocol_version))
@@ -533,26 +578,27 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             # them (such as BulbDevice) make connections when called
             TuyaProtocol.set_version(self, 3.1)
 
-    def set_version(self, version):
-        self.version = version
-        self.version_bytes = str(version).encode('latin1')
+    def set_version(self, protocol_version):
+        """Set the device version and eventually start available DPs detection."""
+        self.version = protocol_version
+        self.version_bytes = str(protocol_version).encode("latin1")
         self.version_header = self.version_bytes + PROTOCOL_3x_HEADER
-        if version == 3.2: # 3.2 behaves like 3.3 with type_0d
+        if protocol_version == 3.2:  # 3.2 behaves like 3.3 with type_0d
             # self.version = 3.3
             self.dev_type = "type_0d"
             if self.dps_to_request == {}:
                 self.detect_available_dps()
-        elif version == 3.4:
+        elif protocol_version == 3.4:
             self.dev_type = "v3.4"
         elif self.dev_type == "v3.4":
             self.dev_type = "default"
 
     def error_json(self, number=None, payload=None):
-        """Return error details in JSON"""
+        """Return error details in JSON."""
         try:
             spayload = json.dumps(payload)
             # spayload = payload.replace('\"','').replace('\'','')
-        except:
+        except Exception:
             spayload = '""'
 
         vals = (error_codes[number], str(number), spayload)
@@ -640,43 +686,51 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             self.transport = None
             transport.close()
 
-    # similar to exchange() but never retries sending and does not decode the response
     async def exchange_quick(self, payload, recv_retries):
-
+        """Similar to exchange() but never retries sending and does not decode the response."""
         if not self.transport:
-            self.debug("[" + self.id + "] send quick failed, could not get socket: %s", payload)
+            self.debug(
+                "[" + self.id + "] send quick failed, could not get socket: %s", payload
+            )
             return None
-        enc_payload = self._encode_message(payload) if type(payload) == MessagePayload else payload
+        enc_payload = (
+            self._encode_message(payload)
+            if isinstance(payload, MessagePayload)
+            else payload
+        )
         # self.debug("Quick-dispatching message %s, seqno %s", binascii.hexlify(enc_payload), self.seqno)
 
         try:
             self.transport.write(enc_payload)
-        except:
+        except Exception:
             # self._check_socket_close(True)
             self.close()
             return None
         while recv_retries:
             try:
-                #msg = await self._receive()
                 seqno = MessageDispatcher.SESS_KEY_SEQNO
-                # seqno = self.seqno - 1
                 msg = await self.dispatcher.wait_for(seqno, payload.cmd)
                 # for 3.4 devices, we get the starting seqno with the SESS_KEY_NEG_RESP message
                 self.seqno = msg.seqno
-            except:
+            except Exception:
                 msg = None
             if msg and len(msg.payload) != 0:
                 return msg
             recv_retries -= 1
             if recv_retries == 0:
-                self.debug("received null payload (%r) but out of recv retries, giving up", msg)
+                self.debug(
+                    "received null payload (%r) but out of recv retries, giving up", msg
+                )
             else:
-                self.debug("received null payload (%r), fetch new one - %s retries remaining", msg, recv_retries)
+                self.debug(
+                    "received null payload (%r), fetch new one - %s retries remaining",
+                    msg,
+                    recv_retries,
+                )
         return None
 
     async def exchange(self, command, dps=None):
         """Send and receive a message, returning response from device."""
-
         if self.version == 3.4 and self.real_local_key == self.local_key:
             self.debug("3.4 device: negotiating a new session key")
             await self._negotiate_session_key()
@@ -822,7 +876,7 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             try:
                 # self.debug("decrypting=%r", payload)
                 payload = cipher.decrypt(payload, False, decode_text=False)
-            except:
+            except Exception:
                 self.debug("incomplete payload=%r (len:%d)", payload, len(payload))
                 return self.error_json(ERR_PAYLOAD)
 
@@ -848,7 +902,7 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
                 try:
                     # self.debug("decrypting=%r", payload)
                     payload = cipher.decrypt(payload, False)
-                except:
+                except Exception:
                     self.debug("incomplete payload=%r (len:%d)", payload, len(payload))
                     return self.error_json(ERR_PAYLOAD)
 
@@ -858,7 +912,7 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             if not isinstance(payload, str):
                 try:
                     payload = payload.decode()
-                except:
+                except Exception:
                     self.debug("payload was not string type and decoding failed")
                     return self.error_json(ERR_JSON, payload)
             if "data unvalid" in payload:
@@ -877,28 +931,34 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
         self.debug("Deciphered data = %r", payload)
         try:
             json_payload = json.loads(payload)
-        except:
+        except Exception:
             json_payload = self.error_json(ERR_JSON, payload)
 
         # v3.4 stuffs it into {"data":{"dps":{"1":true}}, ...}
-        if "dps" not in json_payload and "data" in json_payload and "dps" in json_payload['data']:
-            json_payload['dps'] = json_payload['data']['dps']
+        if (
+            "dps" not in json_payload
+            and "data" in json_payload
+            and "dps" in json_payload["data"]
+        ):
+            json_payload["dps"] = json_payload["data"]["dps"]
 
         return json_payload
 
     async def _negotiate_session_key(self):
-        self.local_nonce = b'0123456789abcdef' # not-so-random random key
-        self.remote_nonce = b''
         self.local_key = self.real_local_key
 
-        rkey = await self.exchange_quick( MessagePayload(SESS_KEY_NEG_START, self.local_nonce), 2 )
-        if not rkey or type(rkey) != TuyaMessage or len(rkey.payload) < 48:
+        rkey = await self.exchange_quick(
+            MessagePayload(SESS_KEY_NEG_START, self.local_nonce), 2
+        )
+        if not rkey or not isinstance(rkey, TuyaMessage) or len(rkey.payload) < 48:
             # error
             self.debug("session key negotiation failed on step 1")
             return False
 
         if rkey.cmd != SESS_KEY_NEG_RESP:
-            self.debug("session key negotiation step 2 returned wrong command: %d", rkey.cmd)
+            self.debug(
+                "session key negotiation step 2 returned wrong command: %d", rkey.cmd
+            )
             return False
 
         payload = rkey.payload
@@ -906,8 +966,12 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             # self.debug("decrypting %r using %r", payload, self.real_local_key)
             cipher = AESCipher(self.real_local_key)
             payload = cipher.decrypt(payload, False, decode_text=False)
-        except:
-            self.debug("session key step 2 decrypt failed, payload=%r (len:%d)", payload, len(payload))
+        except Exception:
+            self.debug(
+                "session key step 2 decrypt failed, payload=%r (len:%d)",
+                payload,
+                len(payload),
+            )
             return False
 
         self.debug("decrypted session key negotiation step 2: payload=%r", payload)
@@ -920,18 +984,26 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
         hmac_check = hmac.new(self.local_key, self.local_nonce, sha256).digest()
 
         if hmac_check != payload[16:48]:
-            self.debug("session key negotiation step 2 failed HMAC check! wanted=%r but got=%r", binascii.hexlify(hmac_check), binascii.hexlify(payload[16:48]))
+            self.debug(
+                "session key negotiation step 2 failed HMAC check! wanted=%r but got=%r",
+                binascii.hexlify(hmac_check),
+                binascii.hexlify(payload[16:48]),
+            )
 
         # self.debug("session local nonce: %r remote nonce: %r", self.local_nonce, self.remote_nonce)
 
         rkey_hmac = hmac.new(self.local_key, self.remote_nonce, sha256).digest()
         await self.exchange_quick(MessagePayload(SESS_KEY_NEG_FINISH, rkey_hmac), None)
 
-        self.local_key = bytes( [ a^b for (a,b) in zip(self.local_nonce,self.remote_nonce) ] )
+        self.local_key = bytes(
+            [a ^ b for (a, b) in zip(self.local_nonce, self.remote_nonce)]
+        )
         # self.debug("Session nonce XOR'd: %r" % self.local_key)
 
         cipher = AESCipher(self.real_local_key)
-        self.local_key = self.dispatcher.local_key = cipher.encrypt(self.local_key, False, pad=False)
+        self.local_key = self.dispatcher.local_key = cipher.encrypt(
+            self.local_key, False, pad=False
+        )
         self.debug("Session key negotiate success! session key: %r", self.local_key)
         return True
 
@@ -945,7 +1017,7 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             if msg.cmd not in NO_PROTOCOL_HEADER_CMDS:
                 # add the 3.x header
                 payload = self.version_header + payload
-            self.debug('final payload for cmd %r: %r', msg.cmd, payload)
+            self.debug("final payload for cmd %r: %r", msg.cmd, payload)
             payload = self.cipher.encrypt(payload, False)
         elif self.version >= 3.2:
             # expect to connect and then disconnect to set new
@@ -997,16 +1069,26 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
         json_data = command_override = None
 
         if command in payload_dict[self.dev_type]:
-            if 'command' in payload_dict[self.dev_type][command]:
-                json_data = payload_dict[self.dev_type][command]['command']
-            if 'command_override' in payload_dict[self.dev_type][command]:
-                command_override = payload_dict[self.dev_type][command]['command_override']
+            if "command" in payload_dict[self.dev_type][command]:
+                json_data = payload_dict[self.dev_type][command]["command"]
+            if "command_override" in payload_dict[self.dev_type][command]:
+                command_override = payload_dict[self.dev_type][command][
+                    "command_override"
+                ]
 
-        if self.dev_type != 'type_0a':
-            if json_data is None and command in payload_dict['type_0a'] and 'command' in payload_dict['type_0a'][command]:
-                json_data = payload_dict['type_0a'][command]['command']
-            if command_override is None and command in payload_dict['type_0a'] and 'command_override' in payload_dict['type_0a'][command]:
-                command_override = payload_dict['type_0a'][command]['command_override']
+        if self.dev_type != "type_0a":
+            if (
+                json_data is None
+                and command in payload_dict["type_0a"]
+                and "command" in payload_dict["type_0a"][command]
+            ):
+                json_data = payload_dict["type_0a"][command]["command"]
+            if (
+                command_override is None
+                and command in payload_dict["type_0a"]
+                and "command_override" in payload_dict["type_0a"][command]
+            ):
+                command_override = payload_dict["type_0a"][command]["command_override"]
 
         if command_override is None:
             command_override = command
@@ -1014,7 +1096,6 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             # I have yet to see a device complain about included but unneeded attribs, but they *will*
             # complain about missing attribs, so just include them all unless otherwise specified
             json_data = {"gwId": "", "devId": "", "uid": "", "t": ""}
-        cmd_data = ""
 
         if "gwId" in json_data:
             if gwId is not None:
@@ -1032,7 +1113,7 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
             else:
                 json_data["uid"] = self.id
         if "t" in json_data:
-            if json_data['t'] == "int":
+            if json_data["t"] == "int":
                 json_data["t"] = int(time.time())
             else:
                 json_data["t"] = str(int(time.time()))
@@ -1057,7 +1138,6 @@ class TuyaProtocol(asyncio.Protocol, ContextualLogger):
 
         return MessagePayload(command_override, payload)
 
-
     def __repr__(self):
         """Return internal string representation of object."""
         return self.id

custom_components/localtuya/select.py

@@ -4,19 +4,15 @@ from functools import partial
 
 import voluptuous as vol
 from homeassistant.components.select import DOMAIN, SelectEntity
-from homeassistant.const import (
-    CONF_DEVICE_CLASS,
-    STATE_UNKNOWN,
-)
+from homeassistant.const import CONF_DEVICE_CLASS, STATE_UNKNOWN
 
 from .common import LocalTuyaEntity, async_setup_entry
-
 from .const import (
+    CONF_DEFAULT_VALUE,
     CONF_OPTIONS,
     CONF_OPTIONS_FRIENDLY,
-    CONF_DEFAULT_VALUE,
-    CONF_RESTORE_ON_RECONNECT,
     CONF_PASSIVE_ENTITY,
+    CONF_RESTORE_ON_RECONNECT,
 )
 
 

custom_components/localtuya/switch.py

@@ -9,14 +9,14 @@ from .common import LocalTuyaEntity, async_setup_entry
 from .const import (
     ATTR_CURRENT,
     ATTR_CURRENT_CONSUMPTION,
-    ATTR_VOLTAGE,
     ATTR_STATE,
+    ATTR_VOLTAGE,
     CONF_CURRENT,
     CONF_CURRENT_CONSUMPTION,
-    CONF_VOLTAGE,
     CONF_DEFAULT_VALUE,
-    CONF_RESTORE_ON_RECONNECT,
     CONF_PASSIVE_ENTITY,
+    CONF_RESTORE_ON_RECONNECT,
+    CONF_VOLTAGE,
 )
 
 _LOGGER = logging.getLogger(__name__)

pylint.rc

@@ -174,7 +174,9 @@ disable=line-too-long,
         unused-variable,
         invalid-name,
         dangerous-default-value,
-		unreachable
+        unreachable,
+        unnecessary-pass,
+		broad-except
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

setup.cfg

@@ -1,10 +1,10 @@
 [flake8]
 exclude = .git,.tox
-max-line-length = 88
+max-line-length = 120
 ignore = E203, W503
 
 [mypy]
-python_version = 3.7
+python_version = 3.9
 ignore_errors = true
 follow_imports = silent
 ignore_missing_imports = true