Merge if statements with enclosing one

Author: bouwew

plugwise_usb/connection/__init__.py

@@ -156,9 +156,8 @@ async def _handle_stick_event(self, event: StickEvent) -> None:
             if not self._queue.is_running:
                 self._queue.start(self._manager)
                 await self.initialize_stick()
-        elif event == StickEvent.DISCONNECTED:
-            if self._queue.is_running:
-                await self._queue.stop()
+        elif event == StickEvent.DISCONNECTED and self._queue.is_running:
+            await self._queue.stop()
 
     async def initialize_stick(self) -> None:
         """Initialize connection to the USB-stick."""

plugwise_usb/nodes/circle.py

@@ -1087,15 +1087,14 @@ def _correct_power_pulses(self, pulses: int, offset: int) -> float:
     async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any]:
         """Update latest state for given feature."""
         states: dict[NodeFeature, Any] = {}
-        if not self._available:
-            if not await self.is_online():
-                _LOGGER.debug(
-                    "Node %s did not respond, unable to update state", self._mac_in_str
-                )
-                for feature in features:
-                    states[feature] = None
-                states[NodeFeature.AVAILABLE] = self.available_state
-                return states
+        if not self._available and not await self.is_online():
+            _LOGGER.debug(
+                "Node %s did not respond, unable to update state", self._mac_in_str
+            )
+            for feature in features:
+                states[feature] = None
+            states[NodeFeature.AVAILABLE] = self.available_state
+            return states
 
         for feature in features:
             if feature not in self._features:

plugwise_usb/nodes/helpers/counter.py

@@ -82,9 +82,8 @@ def add_pulse_log(  # pylint: disable=too-many-arguments
         """Add pulse log."""
         if self._pulse_collection.add_log(
             address, slot, timestamp, pulses, import_only
-        ):
-            if not import_only:
-                self.update()
+        ) and not import_only:
+            self.update()
 
     def get_pulse_logs(self) -> dict[int, dict[int, PulseLogRecord]]:
         """Return currently collected pulse logs."""

plugwise_usb/nodes/node.py

@@ -337,14 +337,14 @@ def _setup_protocol(
         for feature in node_features:
             if (
                 required_version := FEATURE_SUPPORTED_AT_FIRMWARE.get(feature)
-            ) is not None:
-                if (
-                    self._node_protocols.min
-                    <= required_version
-                    <= self._node_protocols.max
-                    and feature not in self._features
-                ):
-                    self._features += (feature,)
+            ) is not None and (
+                self._node_protocols.min
+                <= required_version
+                <= self._node_protocols.max
+                and feature not in self._features
+            ):
+                self._features += (feature,)
+
         self._node_info.features = self._features
 
     async def reconnect(self) -> None:

plugwise_usb/nodes/scan.py

@@ -166,14 +166,12 @@ def _daylight_mode_from_cache(self) -> bool:
     def _motion_from_cache(self) -> bool:
         """Load motion state from cache."""
         if (cached_motion_state := self._get_cache(CACHE_MOTION_STATE)) is not None:
-            if cached_motion_state == "True":
-                if (
-                    motion_timestamp := self._motion_timestamp_from_cache()
-                ) is not None:
-                    if (
-                        datetime.now(tz=UTC) - motion_timestamp
-                    ).seconds < self._reset_timer_from_cache() * 60:
-                        return True
+            if (
+                cached_motion_state == "True"
+                and (motion_timestamp := self._motion_timestamp_from_cache()) is not None
+                and (datetime.now(tz=UTC) - motion_timestamp).seconds < self._reset_timer_from_cache() * 60
+            ):
+                return True
             return False
         return SCAN_DEFAULT_MOTION_STATE