Fix all "is True/False"

Author: bouwew

plugwise/messages/requests.py

@@ -60,7 +60,7 @@ class NodeAddRequest(NodeRequest):
 
     def __init__(self, mac, accept: bool):
         super().__init__(mac)
-        accept_value = 1 if accept is True else 0
+        accept_value = 1 if accept else 0
         self.args.append(Int(accept_value, length=2))
 
     # This message has an exceptional format (MAC at end of message)
@@ -85,7 +85,7 @@ class NodeAllowJoiningRequest(NodeRequest):
     def __init__(self, accept: bool):
         super().__init__("")
         # TODO: Make sure that '01' means enable, and '00' disable joining
-        val = 1 if accept is True else 0
+        val = 1 if accept else 0
         self.args.append(Int(val, length=2))
 
 
@@ -183,7 +183,7 @@ class CircleSwitchRelayRequest(NodeRequest):
 
     def __init__(self, mac, on):
         super().__init__(mac)
-        val = 1 if on is True else 0
+        val = 1 if on else 0
         self.args.append(Int(val, length=2))
 
 
@@ -286,7 +286,7 @@ class CircleEnableScheduleRequest(NodeRequest):
 
     def __init__(self, mac, on):
         super().__init__(mac)
-        val = 1 if on is True else 0
+        val = 1 if on else 0
         self.args.append(Int(val, length=2))
         # the second parameter is always 0x01
         self.args.append(Int(1, length=2))
@@ -335,7 +335,7 @@ class NodeBroadcastGroupSwitchRequest(NodeRequest):
 
     def __init__(self, group_mac, switch_state: bool):
         super().__init__(group_mac)
-        val = 1 if switch_state is True else 0
+        val = 1 if switch_state else 0
         self.args.append(Int(val, length=2))
 
 
@@ -382,7 +382,7 @@ def __init__(
         stay_active_val = Int(stay_active, length=2)
         sleep_for_val = Int(sleep_for, length=4)
         maintenance_interval_val = Int(maintenance_interval, length=4)
-        val = 1 if sync_clock is True else 0
+        val = 1 if sync_clock else 0
         clock_sync_val = Int(val, length=2)
         clock_interval_val = Int(clock_interval, length=4)
         self.args += [
@@ -479,7 +479,7 @@ def __init__(self, mac, reset_timer: int, sensitivity: int, light: bool):
         reset_timer_value = Int(reset_timer, length=2)
         # Sensitivity: HIGH(0x14),  MEDIUM(0x1E),  OFF(0xFF)
         sensitivity_value = Int(sensitivity, length=2)
-        light_temp = 1 if light is True else 0
+        light_temp = 1 if light else 0
         light_value = Int(light_temp, length=2)
         self.args += [
             sensitivity_value,
@@ -524,6 +524,6 @@ class CircleInitialRelaisStateRequest(NodeRequest):
 
     def __init__(self, mac, configure: bool, relais_state: bool):
         super().__init__(mac)
-        set_or_get = Int(1 if configure is True else 0, length=2)
-        relais = Int(1 if relais_state is True else 0, length=2)
+        set_or_get = Int(1 if configure else 0, length=2)
+        relais = Int(1 if relais_state else 0, length=2)
         self.args += [set_or_get, relais]

plugwise/node.py

@@ -32,7 +32,7 @@ class PlugwiseNode:
 
     def __init__(self, mac, address, stick):
         mac = mac.upper()
-        if validate_mac(mac) is False:
+        if not validate_mac(mac):
             _LOGGER.debug(
                 "MAC address is in unexpected format: %s",
                 str(mac),
@@ -99,8 +99,8 @@ def get_available(self) -> bool:
 
     def set_available(self, state, request_info=False):
         """Set current network state of plugwise node."""
-        if state is True:
-            if self._available is False:
+        if state:
+            if not self._available:
                 self._available = True
                 _LOGGER.debug(
                     "Mark node %s available",
@@ -110,7 +110,7 @@ def set_available(self, state, request_info=False):
                 if request_info:
                     self._request_info()
         else:
-            if self._available is True:
+            if self._available:
                 self._available = False
                 _LOGGER.debug(
                     "Mark node %s unavailable",

plugwise/parser.py

@@ -68,7 +68,7 @@ def parse_data(self):  # noqa: C901
         """
         # TODO: flake8 indicates scan is too complex, level 35 indenting is indeed too complex
         _LOGGER.debug("Parse data: %s ", str(self._buffer))
-        if self._parsing is False:
+        if not self._parsing:
             self._parsing = True
 
             # Lookup header of message in buffer

plugwise/stick.py

@@ -322,7 +322,7 @@ def node(self, mac: str) -> PlugwiseNode:
 
     def discover_node(self, mac: str, callback=None, force_discover=False) -> bool:
         """ Discovery of plugwise node """
-        if validate_mac(mac) is True:
+        if validate_mac(mac):
             if not self._plugwise_nodes.get(mac):
                 if mac not in self._nodes_not_discovered.keys():
                     self._nodes_not_discovered[mac] = (
@@ -458,7 +458,7 @@ def allow_join_requests(self, enable: bool, accept: bool):
 
     def node_join(self, mac: str, callback=None) -> bool:
         """Accept node to join Plugwise network by adding it in Circle+ memory"""
-        if validate_mac(mac) is True:
+        if validate_mac(mac):
             self.send(NodeAddRequest(bytes(mac, UTF8_DECODE), True), callback)
             return True
 
@@ -467,7 +467,7 @@ def node_join(self, mac: str, callback=None) -> bool:
 
     def node_unjoin(self, mac: str, callback=None) -> bool:
         """Remove node from the Plugwise network by deleting it from the Circle+ memory"""
-        if validate_mac(mac) is True:
+        if validate_mac(mac):
             self.send(
                 NodeRemoveRequest(bytes(self.circle_plus_mac, UTF8_DECODE), mac),
                 callback,
@@ -1344,7 +1344,7 @@ def _watchdog_loop(self):
                     self._update_thread.daemon = True
                     self._update_thread.start()
             # Circle+ discovery
-            if self._circle_plus_discovered is False:
+            if not self._circle_plus_discovered:
                 # First hour every once an hour
                 if self._circle_plus_retries < 60 or circle_plus_retry_counter > 60:
                     _LOGGER.info(