From 3aeb53ec986a950ff0794d33b7f9223fe7e308a4 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 7 Apr 2022 15:10:38 +0200 Subject: [PATCH] Use EntityFeature enum in components (y**) (#69470) --- .../yale_smart_alarm/alarm_control_panel.py | 12 ++-- .../components/yamaha/media_player.py | 46 ++++++--------- .../yamaha_musiccast/media_player.py | 58 ++++++++----------- 3 files changed, 51 insertions(+), 65 deletions(-) diff --git a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py index 20d88ca4859..fbd3f945aa2 100644 --- a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py +++ b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py @@ -9,10 +9,9 @@ from yalesmartalarmclient.const import ( YALE_STATE_DISARM, ) -from homeassistant.components.alarm_control_panel import AlarmControlPanelEntity -from homeassistant.components.alarm_control_panel.const import ( - SUPPORT_ALARM_ARM_AWAY, - SUPPORT_ALARM_ARM_HOME, +from homeassistant.components.alarm_control_panel import ( + AlarmControlPanelEntity, + AlarmControlPanelEntityFeature, ) from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_NAME @@ -40,7 +39,10 @@ class YaleAlarmDevice(YaleAlarmEntity, AlarmControlPanelEntity): """Represent a Yale Smart Alarm.""" _attr_code_arm_required = False - _attr_supported_features = SUPPORT_ALARM_ARM_HOME | SUPPORT_ALARM_ARM_AWAY + _attr_supported_features = ( + AlarmControlPanelEntityFeature.ARM_HOME + | AlarmControlPanelEntityFeature.ARM_AWAY + ) def __init__(self, coordinator: YaleDataUpdateCoordinator) -> None: """Initialize the Yale Alarm Device.""" diff --git a/homeassistant/components/yamaha/media_player.py b/homeassistant/components/yamaha/media_player.py index 4a816b99aca..1e48fceba07 100644 --- a/homeassistant/components/yamaha/media_player.py +++ b/homeassistant/components/yamaha/media_player.py @@ -7,22 +7,12 @@ import requests import rxv import voluptuous as vol -from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEntity -from homeassistant.components.media_player.const import ( - MEDIA_TYPE_MUSIC, - SUPPORT_NEXT_TRACK, - SUPPORT_PAUSE, - SUPPORT_PLAY, - SUPPORT_PLAY_MEDIA, - SUPPORT_PREVIOUS_TRACK, - SUPPORT_SELECT_SOUND_MODE, - SUPPORT_SELECT_SOURCE, - SUPPORT_STOP, - SUPPORT_TURN_OFF, - SUPPORT_TURN_ON, - SUPPORT_VOLUME_MUTE, - SUPPORT_VOLUME_SET, +from homeassistant.components.media_player import ( + PLATFORM_SCHEMA, + MediaPlayerEntity, + MediaPlayerEntityFeature, ) +from homeassistant.components.media_player.const import MEDIA_TYPE_MUSIC from homeassistant.const import ( CONF_HOST, CONF_NAME, @@ -73,13 +63,13 @@ DATA_YAMAHA = "yamaha_known_receivers" DEFAULT_NAME = "Yamaha Receiver" SUPPORT_YAMAHA = ( - SUPPORT_VOLUME_SET - | SUPPORT_VOLUME_MUTE - | SUPPORT_TURN_ON - | SUPPORT_TURN_OFF - | SUPPORT_SELECT_SOURCE - | SUPPORT_PLAY - | SUPPORT_SELECT_SOUND_MODE + MediaPlayerEntityFeature.VOLUME_SET + | MediaPlayerEntityFeature.VOLUME_MUTE + | MediaPlayerEntityFeature.TURN_ON + | MediaPlayerEntityFeature.TURN_OFF + | MediaPlayerEntityFeature.SELECT_SOURCE + | MediaPlayerEntityFeature.PLAY + | MediaPlayerEntityFeature.SELECT_SOUND_MODE ) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( @@ -332,11 +322,13 @@ class YamahaDevice(MediaPlayerEntity): supports = self._playback_support mapping = { - "play": (SUPPORT_PLAY | SUPPORT_PLAY_MEDIA), - "pause": SUPPORT_PAUSE, - "stop": SUPPORT_STOP, - "skip_f": SUPPORT_NEXT_TRACK, - "skip_r": SUPPORT_PREVIOUS_TRACK, + "play": ( + MediaPlayerEntityFeature.PLAY | MediaPlayerEntityFeature.PLAY_MEDIA + ), + "pause": MediaPlayerEntityFeature.PAUSE, + "stop": MediaPlayerEntityFeature.STOP, + "skip_f": MediaPlayerEntityFeature.NEXT_TRACK, + "skip_r": MediaPlayerEntityFeature.PREVIOUS_TRACK, } for attr, feature in mapping.items(): if getattr(supports, attr, False): diff --git a/homeassistant/components/yamaha_musiccast/media_player.py b/homeassistant/components/yamaha_musiccast/media_player.py index 3618bc78dbe..d0141977f29 100644 --- a/homeassistant/components/yamaha_musiccast/media_player.py +++ b/homeassistant/components/yamaha_musiccast/media_player.py @@ -8,7 +8,11 @@ from aiomusiccast import MusicCastGroupException, MusicCastMediaContent from aiomusiccast.features import ZoneFeature from homeassistant.components import media_source -from homeassistant.components.media_player import BrowseMedia, MediaPlayerEntity +from homeassistant.components.media_player import ( + BrowseMedia, + MediaPlayerEntity, + MediaPlayerEntityFeature, +) from homeassistant.components.media_player.browse_media import ( async_process_play_media_url, ) @@ -17,23 +21,6 @@ from homeassistant.components.media_player.const import ( MEDIA_CLASS_TRACK, MEDIA_TYPE_MUSIC, REPEAT_MODE_OFF, - SUPPORT_BROWSE_MEDIA, - SUPPORT_GROUPING, - SUPPORT_NEXT_TRACK, - SUPPORT_PAUSE, - SUPPORT_PLAY, - SUPPORT_PLAY_MEDIA, - SUPPORT_PREVIOUS_TRACK, - SUPPORT_REPEAT_SET, - SUPPORT_SELECT_SOUND_MODE, - SUPPORT_SELECT_SOURCE, - SUPPORT_SHUFFLE_SET, - SUPPORT_STOP, - SUPPORT_TURN_OFF, - SUPPORT_TURN_ON, - SUPPORT_VOLUME_MUTE, - SUPPORT_VOLUME_SET, - SUPPORT_VOLUME_STEP, ) from homeassistant.config_entries import ConfigEntry from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING @@ -58,12 +45,12 @@ from .const import ( _LOGGER = logging.getLogger(__name__) MUSIC_PLAYER_BASE_SUPPORT = ( - SUPPORT_SHUFFLE_SET - | SUPPORT_REPEAT_SET - | SUPPORT_SELECT_SOUND_MODE - | SUPPORT_SELECT_SOURCE - | SUPPORT_GROUPING - | SUPPORT_PLAY_MEDIA + MediaPlayerEntityFeature.SHUFFLE_SET + | MediaPlayerEntityFeature.REPEAT_SET + | MediaPlayerEntityFeature.SELECT_SOUND_MODE + | MediaPlayerEntityFeature.SELECT_SOURCE + | MediaPlayerEntityFeature.GROUPING + | MediaPlayerEntityFeature.PLAY_MEDIA ) @@ -449,23 +436,28 @@ class MusicCastMediaPlayer(MusicCastDeviceEntity, MediaPlayerEntity): zone = self.coordinator.data.zones[self._zone_id] if ZoneFeature.POWER in zone.features: - supported_features |= SUPPORT_TURN_ON | SUPPORT_TURN_OFF + supported_features |= ( + MediaPlayerEntityFeature.TURN_ON | MediaPlayerEntityFeature.TURN_OFF + ) if ZoneFeature.VOLUME in zone.features: - supported_features |= SUPPORT_VOLUME_SET | SUPPORT_VOLUME_STEP + supported_features |= ( + MediaPlayerEntityFeature.VOLUME_SET + | MediaPlayerEntityFeature.VOLUME_STEP + ) if ZoneFeature.MUTE in zone.features: - supported_features |= SUPPORT_VOLUME_MUTE + supported_features |= MediaPlayerEntityFeature.VOLUME_MUTE if self._is_netusb or self._is_tuner: - supported_features |= SUPPORT_PREVIOUS_TRACK - supported_features |= SUPPORT_NEXT_TRACK + supported_features |= MediaPlayerEntityFeature.PREVIOUS_TRACK + supported_features |= MediaPlayerEntityFeature.NEXT_TRACK if self._is_netusb: - supported_features |= SUPPORT_PAUSE - supported_features |= SUPPORT_PLAY - supported_features |= SUPPORT_STOP + supported_features |= MediaPlayerEntityFeature.PAUSE + supported_features |= MediaPlayerEntityFeature.PLAY + supported_features |= MediaPlayerEntityFeature.STOP if self.state != STATE_OFF: - supported_features |= SUPPORT_BROWSE_MEDIA + supported_features |= MediaPlayerEntityFeature.BROWSE_MEDIA return supported_features