Enable Ruff RUF018 (#115485)

Author: autinerd

homeassistant/components/api/__init__.py

@@ -284,7 +284,8 @@ async def post(self, request: web.Request, entity_id: str) -> web.Response:
 
         # Read the state back for our response
         status_code = HTTPStatus.CREATED if is_new_state else HTTPStatus.OK
-        assert (state := hass.states.get(entity_id))
+        state = hass.states.get(entity_id)
+        assert state
         resp = self.json(state.as_dict(), status_code)
 
         resp.headers.add("Location", f"/api/states/{entity_id}")

homeassistant/components/light/__init__.py

@@ -517,13 +517,13 @@ async def async_handle_light_on_service(  # noqa: C901
                     params[ATTR_COLOR_TEMP_KELVIN]
                 )
         elif ATTR_RGB_COLOR in params and ColorMode.RGB not in supported_color_modes:
-            assert (rgb_color := params.pop(ATTR_RGB_COLOR)) is not None
+            rgb_color = params.pop(ATTR_RGB_COLOR)
+            assert rgb_color is not None
             if ColorMode.RGBW in supported_color_modes:
                 params[ATTR_RGBW_COLOR] = color_util.color_rgb_to_rgbw(*rgb_color)
             elif ColorMode.RGBWW in supported_color_modes:
-                # https://github.com/python/mypy/issues/13673
                 params[ATTR_RGBWW_COLOR] = color_util.color_rgb_to_rgbww(
-                    *rgb_color,  # type: ignore[call-arg]
+                    *rgb_color,
                     light.min_color_temp_kelvin,
                     light.max_color_temp_kelvin,
                 )
@@ -584,9 +584,9 @@ async def async_handle_light_on_service(  # noqa: C901
         elif (
             ATTR_RGBWW_COLOR in params and ColorMode.RGBWW not in supported_color_modes
         ):
-            assert (rgbww_color := params.pop(ATTR_RGBWW_COLOR)) is not None
-            # https://github.com/python/mypy/issues/13673
-            rgb_color = color_util.color_rgbww_to_rgb(  # type: ignore[call-arg]
+            rgbww_color = params.pop(ATTR_RGBWW_COLOR)
+            assert rgbww_color is not None
+            rgb_color = color_util.color_rgbww_to_rgb(
                 *rgbww_color, light.min_color_temp_kelvin, light.max_color_temp_kelvin
             )
             if ColorMode.RGB in supported_color_modes:

homeassistant/components/mqtt_statestream/__init__.py

@@ -57,7 +57,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async def _state_publisher(evt: Event[EventStateChangedData]) -> None:
         entity_id = evt.data["entity_id"]
-        assert (new_state := evt.data["new_state"])
+        new_state = evt.data["new_state"]
+        assert new_state
 
         payload = new_state.state
 

homeassistant/components/ring/camera.py

@@ -167,7 +167,8 @@ async def async_update(self) -> None:
     def _get_video(self) -> str | None:
         if self._last_event is None:
             return None
-        assert (event_id := self._last_event.get("id")) and isinstance(event_id, int)
+        event_id = self._last_event.get("id")
+        assert event_id and isinstance(event_id, int)
         return self._device.recording_url(event_id)
 
     @exception_wrap

homeassistant/components/zwave_js/diagnostics.py

@@ -151,7 +151,8 @@ async def async_get_device_diagnostics(
     client: Client = hass.data[DOMAIN][config_entry.entry_id][DATA_CLIENT]
     identifiers = get_home_and_node_id_from_device_entry(device)
     node_id = identifiers[1] if identifiers else None
-    assert (driver := client.driver)
+    driver = client.driver
+    assert driver
     if node_id is None or node_id not in driver.controller.nodes:
         raise ValueError(f"Node for device {device.id} can't be found")
     node = driver.controller.nodes[node_id]

pyproject.toml

@@ -701,6 +701,7 @@ select = [
     "RUF005", # Consider iterable unpacking instead of concatenation
     "RUF006", # Store a reference to the return value of asyncio.create_task
     "RUF013", # PEP 484 prohibits implicit Optional
+    "RUF018", # Avoid assignment expressions in assert statements
     # "RUF100", # Unused `noqa` directive; temporarily every now and then to clean them up
     "S102", # Use of exec detected
     "S103", # bad-file-permissions

tests/ruff.toml

@@ -6,6 +6,7 @@ extend = "../pyproject.toml"
 extend-ignore = [
     "B904", # Use raise from to specify exception cause
     "N815", # Variable {name} in class scope should not be mixedCase
+    "RUF018", # Avoid assignment expressions in assert statements
 ]
 
 [lint.isort]