jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-11 23:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor entity_category str types (#62790)

Browse Source
This commit is contained in:
Dave T 2021-12-27 17:23:08 +00:00 committed by GitHub
parent 377b0efc60
commit 8fd60dbd51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/mqtt/mixins.py
View File

@ -33,6 +33,7 @@ from homeassistant.helpers.entity import (
ENTITY_CATEGORIES_SCHEMA, ENTITY_CATEGORIES_SCHEMA,
DeviceInfo, DeviceInfo,
Entity, Entity,
EntityCategory,
async_generate_entity_id, async_generate_entity_id,
) )
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
@ -695,7 +696,7 @@ class MqttEntity(
return self._config[CONF_ENABLED_BY_DEFAULT] return self._config[CONF_ENABLED_BY_DEFAULT]
@property @property
def entity_category(self) -> str | None: def entity_category(self) -> EntityCategory | str | None:
"""Return the entity category if any.""" """Return the entity category if any."""
return self._config.get(CONF_ENTITY_CATEGORY) return self._config.get(CONF_ENTITY_CATEGORY)

2
homeassistant/components/neato/sensor.py
View File

@ -84,7 +84,7 @@ class NeatoSensor(SensorEntity):
return SensorDeviceClass.BATTERY return SensorDeviceClass.BATTERY
@property @property
def entity_category(self) -> str: def entity_category(self) -> EntityCategory:
"""Device entity category.""" """Device entity category."""
return EntityCategory.DIAGNOSTIC return EntityCategory.DIAGNOSTIC

14
homeassistant/components/shelly/entity.py
View File

@ -19,7 +19,7 @@ from homeassistant.helpers import (
entity_registry, entity_registry,
update_coordinator, update_coordinator,
) )
from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity import DeviceInfo, EntityCategory
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.typing import StateType from homeassistant.helpers.typing import StateType
@ -237,7 +237,7 @@ class BlockAttributeDescription:
# Callable (settings, block), return true if entity should be removed # Callable (settings, block), return true if entity should be removed
removal_condition: Callable[[dict, Block], bool] | None = None removal_condition: Callable[[dict, Block], bool] | None = None
extra_state_attributes: Callable[[Block], dict | None] | None = None extra_state_attributes: Callable[[Block], dict | None] | None = None
entity_category: str | None = None entity_category: EntityCategory | None = None
@dataclass @dataclass
@ -256,7 +256,7 @@ class RpcAttributeDescription:
available: Callable[[dict], bool] | None = None available: Callable[[dict], bool] | None = None
removal_condition: Callable[[dict, str], bool] | None = None removal_condition: Callable[[dict, str], bool] | None = None
extra_state_attributes: Callable[[dict, dict], dict | None] | None = None extra_state_attributes: Callable[[dict, dict], dict | None] | None = None
entity_category: str | None = None entity_category: EntityCategory | None = None
@dataclass @dataclass
@ -271,7 +271,7 @@ class RestAttributeDescription:
state_class: str | None = None state_class: str | None = None
default_enabled: bool = True default_enabled: bool = True
extra_state_attributes: Callable[[dict], dict | None] | None = None extra_state_attributes: Callable[[dict], dict | None] | None = None
entity_category: str | None = None entity_category: EntityCategory | None = None
class ShellyBlockEntity(entity.Entity): class ShellyBlockEntity(entity.Entity):
@ -471,7 +471,7 @@ class ShellyBlockAttributeEntity(ShellyBlockEntity, entity.Entity):
return self.description.extra_state_attributes(self.block) return self.description.extra_state_attributes(self.block)
@property @property
def entity_category(self) -> str | None: def entity_category(self) -> EntityCategory | None:
"""Return category of entity.""" """Return category of entity."""
return self.description.entity_category return self.description.entity_category
@ -548,7 +548,7 @@ class ShellyRestAttributeEntity(update_coordinator.CoordinatorEntity):
return self.description.extra_state_attributes(self.wrapper.device.status) return self.description.extra_state_attributes(self.wrapper.device.status)
@property @property
def entity_category(self) -> str | None: def entity_category(self) -> EntityCategory | None:
"""Return category of entity.""" """Return category of entity."""
return self.description.entity_category return self.description.entity_category
@ -614,7 +614,7 @@ class ShellyRpcAttributeEntity(ShellyRpcEntity, entity.Entity):
) )
@property @property
def entity_category(self) -> str | None: def entity_category(self) -> EntityCategory | None:
"""Return category of entity.""" """Return category of entity."""
return self.description.entity_category return self.description.entity_category

2
homeassistant/components/tasmota/sensor.py
View File

@ -274,7 +274,7 @@ class TasmotaSensor(TasmotaAvailability, TasmotaDiscoveryUpdate, SensorEntity):
return class_or_icon.get(STATE_CLASS) return class_or_icon.get(STATE_CLASS)
@property @property
def entity_category(self) -> str | None: def entity_category(self) -> EntityCategory | None:
"""Return the category of the entity, if any.""" """Return the category of the entity, if any."""
if self._tasmota_entity.quantity in status_sensor.SENSORS: if self._tasmota_entity.quantity in status_sensor.SENSORS:
return EntityCategory.DIAGNOSTIC return EntityCategory.DIAGNOSTIC