Address @bouwew comments

Address sonarqubecloud comments

Author: dirixmjm

plugwise_usb/network/__init__.py

@@ -434,7 +434,7 @@ async def _discover_stragglers(self) -> None:
         """Repeat Discovery of Nodes with unknown NodeType."""
         while len(self._registry_stragglers) > 0:
             await sleep(NODE_RETRY_DISCOVER_INTERVAL)
-            for mac in list(self._registry_stragglers):
+            for mac in self._registry_stragglers.copy():
                 if await self._discover_node(mac, None):
                     self._registry_stragglers.remove(mac)
             _LOGGER.debug(

plugwise_usb/network/cache.py

@@ -80,11 +80,11 @@ def get_nodetype(self, mac: str) -> NodeType | None:
 
     async def prune_cache(self, registry: list[str]) -> None:
         """Remove items from cache which are not found in registry scan."""
-        _new_nodetypes: dict[str, NodeType] = {}
+        new_nodetypes: dict[str, NodeType] = {}
         for mac in registry:
             if mac == "":
                 continue
             if (node_type := self.get_nodetype(mac)) is not None:
-                _new_nodetypes[mac] = node_type
-        self._nodetypes = _new_nodetypes
+                new_nodetypes[mac] = node_type
+        self._nodetypes = new_nodetypes
         await self.save_cache()

plugwise_usb/network/registry.py

@@ -163,7 +163,7 @@ def network_controller(self) -> tuple[str, NodeType | None]:
         return self.registry[-1]
 
     async def update_network_nodetype(self, mac: str, node_type: NodeType) -> None:
-        """Update NodeType Inside Registry and Cache."""
+        """Update NodeType inside registry and cache."""
         if self._network_cache is None or mac == "":
             return
         await self._network_cache.update_nodetypes(mac, node_type)
@@ -228,7 +228,7 @@ async def load_registrations_from_cache(self) -> None:
         if self._scan_completed_callback is not None:
             await self._scan_completed_callback()
 
-    async def update_node_registration(self, mac: str) -> bool:
+    def update_node_registration(self, mac: str) -> bool:
         """Register (re)joined node to Plugwise network and return network address."""
         return self.update_network_registration(mac)
 

plugwise_usb/nodes/scan.py

@@ -147,9 +147,9 @@ async def _load_defaults(self) -> None:
 
     async def _load_from_cache(self) -> bool:
         """Load states from previous cached information. Returns True if successful."""
-        LoadSuccess = True
+        super_load_success = True
         if not await super()._load_from_cache():
-            LoadSuccess = False
+            super_load_success = False
         self._motion_state = MotionState(
             state=self._motion_from_cache(),
             timestamp=self._motion_timestamp_from_cache(),
@@ -174,7 +174,7 @@ async def _load_from_cache(self) -> bool:
         )
         if dirty:
             await self._scan_configure_update()
-        return LoadSuccess
+        return super_load_success
 
     def _daylight_mode_from_cache(self) -> bool | None:
         """Load awake duration from cache."""

plugwise_usb/nodes/sed.py

@@ -142,9 +142,9 @@ async def _load_defaults(self) -> None:
 
     async def _load_from_cache(self) -> bool:
         """Load states from previous cached information. Returns True if successful."""
-        LoadSuccess = True
+        super_load_success = True
         if not await super()._load_from_cache():
-            LoadSuccess = False
+            super_load_success = False
         dirty = False
         if (awake_duration := self._awake_duration_from_cache()) is None:
             dirty = True
@@ -174,7 +174,7 @@ async def _load_from_cache(self) -> bool:
             await self._sed_configure_update()
         self._awake_timestamp_from_cache()
         self._awake_reason_from_cache()
-        return LoadSuccess
+        return super_load_success
 
     def _awake_duration_from_cache(self) -> int | None:
         """Load awake duration from cache."""

tests/test_usb.py

@@ -332,7 +332,7 @@ async def test_msg_properties(self) -> None:
         )
         assert unix_timestamp.serialize() == b"4E08478A"
         with pytest.raises(pw_exceptions.MessageError):
-            assert unix_timestamp.value == dt(2011, 6, 27, 9, 4, 10, tzinfo=UTC)
+            unix_timestamp.value == dt(2011, 6, 27, 9, 4, 10, tzinfo=UTC)
         unix_timestamp.deserialize(b"4E08478A")
         assert unix_timestamp.value == dt(2011, 6, 27, 9, 4, 10, tzinfo=UTC)
 
@@ -343,11 +343,11 @@ async def test_stick_connect_without_port(self) -> None:
         assert stick.nodes == {}
         assert stick.joined_nodes is None
         with pytest.raises(pw_exceptions.StickError):
-            assert stick.mac_stick
+            stick.mac_stick
         with pytest.raises(pw_exceptions.StickError):
-            assert stick.mac_coordinator
+            stick.mac_coordinator
         with pytest.raises(pw_exceptions.StickError):
-            assert stick.network_id
+            stick.network_id
         assert not stick.network_discovered
         assert not stick.network_state
 
@@ -1910,7 +1910,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
     async def test_sed_node(self, monkeypatch: pytest.MonkeyPatch) -> None:  # noqa:  PLR0915
         """Testing properties of SED."""
 
-        def fake_cache(dummy: object, setting: str) -> str | None:  # noqa: PLR0911
+        def fake_cache(dummy: object, setting: str) -> str | bool | None:  # noqa: PLR0911
             """Fake cache retrieval."""
             if setting == pw_node.CACHE_FIRMWARE:
                 return "2011-6-27-8-55-44"
@@ -1973,9 +1973,9 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_sed.awake_duration == 20
         assert test_sed.battery_config.awake_duration == 20
         with pytest.raises(ValueError):
-            assert await test_sed.set_awake_duration(0)
+            await test_sed.set_awake_duration(0)
         with pytest.raises(ValueError):
-            assert await test_sed.set_awake_duration(256)
+            await test_sed.set_awake_duration(256)
         assert await test_sed.set_awake_duration(10)
         assert test_sed.battery_config.dirty
         assert await test_sed.set_awake_duration(15)
@@ -2016,9 +2016,9 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_sed.maintenance_interval == 60
         assert test_sed.battery_config.maintenance_interval == 60
         with pytest.raises(ValueError):
-            assert await test_sed.set_maintenance_interval(0)
+            await test_sed.set_maintenance_interval(0)
         with pytest.raises(ValueError):
-            assert await test_sed.set_maintenance_interval(1500)
+            await test_sed.set_maintenance_interval(1500)
         assert not await test_sed.set_maintenance_interval(60)
         assert not test_sed.battery_config.dirty
         assert await test_sed.set_maintenance_interval(30)
@@ -2040,9 +2040,9 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_sed.clock_interval == 12600
         assert test_sed.battery_config.clock_interval == 12600
         with pytest.raises(ValueError):
-            assert await test_sed.set_clock_interval(0)
+            await test_sed.set_clock_interval(0)
         with pytest.raises(ValueError):
-            assert await test_sed.set_clock_interval(65536)
+            await test_sed.set_clock_interval(65536)
         assert not await test_sed.set_clock_interval(12600)
         assert not test_sed.battery_config.dirty
         assert await test_sed.set_clock_interval(15000)
@@ -2083,9 +2083,9 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_sed.sleep_duration == 60
         assert test_sed.battery_config.sleep_duration == 60
         with pytest.raises(ValueError):
-            assert await test_sed.set_sleep_duration(0)
+            await test_sed.set_sleep_duration(0)
         with pytest.raises(ValueError):
-            assert await test_sed.set_sleep_duration(65536)
+            await test_sed.set_sleep_duration(65536)
         assert not await test_sed.set_sleep_duration(60)
         assert await test_sed.set_sleep_duration(120)
         assert test_sed.battery_config.dirty
@@ -2106,7 +2106,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
     async def test_scan_node(self, monkeypatch: pytest.MonkeyPatch) -> None:  # noqa: PLR0915
         """Testing properties of scan."""
 
-        def fake_cache(dummy: object, setting: str) -> str | None:  # noqa: PLR0911 PLR0912
+        def fake_cache(dummy: object, setting: str) -> str | bool | None:  # noqa: PLR0911 PLR0912
             """Fake cache retrieval."""
             if setting == pw_node.CACHE_FIRMWARE:
                 return "2011-6-27-8-55-44"
@@ -2179,9 +2179,9 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         assert test_scan.reset_timer == 10
         assert test_scan.motion_config.reset_timer == 10
         with pytest.raises(ValueError):
-            assert await test_scan.set_motion_reset_timer(0)
+            await test_scan.set_motion_reset_timer(0)
         with pytest.raises(ValueError):
-            assert await test_scan.set_motion_reset_timer(256)
+            await test_scan.set_motion_reset_timer(256)
         assert not await test_scan.set_motion_reset_timer(10)
         assert not test_scan.motion_config.dirty
         assert await test_scan.set_motion_reset_timer(15)
@@ -2308,7 +2308,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
     async def test_switch_node(self, monkeypatch: pytest.MonkeyPatch) -> None:
         """Testing properties of switch."""
 
-        def fake_cache(dummy: object, setting: str) -> str | None:  # noqa: PLR0911
+        def fake_cache(dummy: object, setting: str) -> str | bool | None:  # noqa: PLR0911
             """Fake cache retrieval."""
             if setting == pw_node.CACHE_FIRMWARE:
                 return "2011-5-13-7-26-54"
@@ -2411,7 +2411,7 @@ async def test_node_discovery_and_load(  # noqa: PLR0915
     ) -> None:
         """Testing discovery of nodes."""
 
-        def fake_cache(dummy: object, setting: str) -> str | None:  # noqa: PLR0911
+        def fake_cache(dummy: object, setting: str) -> str | bool | None:  # noqa: PLR0911
             """Fake cache retrieval."""
             if setting == pw_node.CACHE_FIRMWARE:
                 return "2011-5-13-7-26-54"