jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-14 16:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated supported features warning in Camera (#132640)

Browse Source
This commit is contained in:
epenet 2024-12-09 08:24:09 +01:00 committed by GitHub
parent 206cac6811
commit 644b07d084
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/camera/__init__.py
View File

@ -516,19 +516,6 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
"""Flag supported features.""" """Flag supported features."""
return self._attr_supported_features return self._attr_supported_features
@property
def supported_features_compat(self) -> CameraEntityFeature:
"""Return the supported features as CameraEntityFeature.
Remove this compatibility shim in 2025.1 or later.
"""
features = self.supported_features
if type(features) is int: # noqa: E721
new_features = CameraEntityFeature(features)
self._report_deprecated_supported_features_values(new_features)
return new_features
return features
@cached_property @cached_property
def is_recording(self) -> bool: def is_recording(self) -> bool:
"""Return true if the device is recording.""" """Return true if the device is recording."""
@ -582,7 +569,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
self._deprecate_attr_frontend_stream_type_logged = True self._deprecate_attr_frontend_stream_type_logged = True
return self._attr_frontend_stream_type return self._attr_frontend_stream_type
if CameraEntityFeature.STREAM not in self.supported_features_compat: if CameraEntityFeature.STREAM not in self.supported_features:
return None return None
if ( if (
self._webrtc_provider self._webrtc_provider
@ -811,9 +798,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
async def async_internal_added_to_hass(self) -> None: async def async_internal_added_to_hass(self) -> None:
"""Run when entity about to be added to hass.""" """Run when entity about to be added to hass."""
await super().async_internal_added_to_hass() await super().async_internal_added_to_hass()
self.__supports_stream = ( self.__supports_stream = self.supported_features & CameraEntityFeature.STREAM
self.supported_features_compat & CameraEntityFeature.STREAM
)
await self.async_refresh_providers(write_state=False) await self.async_refresh_providers(write_state=False)
async def async_refresh_providers(self, *, write_state: bool = True) -> None: async def async_refresh_providers(self, *, write_state: bool = True) -> None:
@ -853,7 +838,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
self, fn: Callable[[HomeAssistant, Camera], Coroutine[None, None, _T | None]] self, fn: Callable[[HomeAssistant, Camera], Coroutine[None, None, _T | None]]
) -> _T | None: ) -> _T | None:
"""Get first provider that supports this camera.""" """Get first provider that supports this camera."""
if CameraEntityFeature.STREAM not in self.supported_features_compat: if CameraEntityFeature.STREAM not in self.supported_features:
return None return None
return await fn(self.hass, self) return await fn(self.hass, self)
@ -911,7 +896,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
def camera_capabilities(self) -> CameraCapabilities: def camera_capabilities(self) -> CameraCapabilities:
"""Return the camera capabilities.""" """Return the camera capabilities."""
frontend_stream_types = set() frontend_stream_types = set()
if CameraEntityFeature.STREAM in self.supported_features_compat: if CameraEntityFeature.STREAM in self.supported_features:
if self._supports_native_sync_webrtc or self._supports_native_async_webrtc: if self._supports_native_sync_webrtc or self._supports_native_async_webrtc:
# The camera has a native WebRTC implementation # The camera has a native WebRTC implementation
frontend_stream_types.add(StreamType.WEB_RTC) frontend_stream_types.add(StreamType.WEB_RTC)
@ -931,8 +916,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
""" """
super().async_write_ha_state() super().async_write_ha_state()
if self.__supports_stream != ( if self.__supports_stream != (
supports_stream := self.supported_features_compat supports_stream := self.supported_features & CameraEntityFeature.STREAM
& CameraEntityFeature.STREAM
): ):
self.__supports_stream = supports_stream self.__supports_stream = supports_stream
self._invalidate_camera_capabilities_cache() self._invalidate_camera_capabilities_cache()

20
tests/components/camera/test_init.py
View File

@ -826,26 +826,6 @@ def test_deprecated_state_constants(
import_and_test_deprecated_constant_enum(caplog, module, enum, "STATE_", "2025.10") import_and_test_deprecated_constant_enum(caplog, module, enum, "STATE_", "2025.10")
def test_deprecated_supported_features_ints(caplog: pytest.LogCaptureFixture) -> None:
"""Test deprecated supported features ints."""
class MockCamera(camera.Camera):
@property
def supported_features(self) -> int:
"""Return supported features."""
return 1
entity = MockCamera()
assert entity.supported_features_compat is camera.CameraEntityFeature(1)
assert "MockCamera" in caplog.text
assert "is using deprecated supported features values" in caplog.text
assert "Instead it should use" in caplog.text
assert "CameraEntityFeature.ON_OFF" in caplog.text
caplog.clear()
assert entity.supported_features_compat is camera.CameraEntityFeature(1)
assert "is using deprecated supported features values" not in caplog.text
@pytest.mark.usefixtures("mock_camera") @pytest.mark.usefixtures("mock_camera")
async def test_entity_picture_url_changes_on_token_update(hass: HomeAssistant) -> None: async def test_entity_picture_url_changes_on_token_update(hass: HomeAssistant) -> None:
"""Test the token is rotated and entity entity picture cache is cleared.""" """Test the token is rotated and entity entity picture cache is cleared."""