From d5efb3e3de4f3d12c2f55976134c12f0f411b9b8 Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Sun, 29 Nov 2020 00:44:25 +0100
Subject: [PATCH] Remove temporary variable by only retrieving needed value
(#42522)
---
homeassistant/components/alexa/handlers.py | 4 +--
.../components/bmw_connected_drive/sensor.py | 2 +-
.../components/broadlink/config_flow.py | 4 +--
homeassistant/components/cast/media_player.py | 32 +++++++++----------
homeassistant/components/doorbird/logbook.py | 2 +-
homeassistant/components/mysensors/sensor.py | 4 +--
homeassistant/components/scsgate/__init__.py | 2 +-
homeassistant/components/unifi/controller.py | 4 +--
homeassistant/components/xbox/media_source.py | 4 +--
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/homeassistant/components/alexa/handlers.py b/homeassistant/components/alexa/handlers.py
index 65c48ba0206..8837210b6ad 100644
--- a/homeassistant/components/alexa/handlers.py
+++ b/homeassistant/components/alexa/handlers.py
@@ -995,14 +995,14 @@ async def async_api_set_mode(hass, config, directive, context):
# Fan Direction
if instance == f"{fan.DOMAIN}.{fan.ATTR_DIRECTION}":
- _, direction = mode.split(".")
+ direction = mode.split(".")[1]
if direction in (fan.DIRECTION_REVERSE, fan.DIRECTION_FORWARD):
service = fan.SERVICE_SET_DIRECTION
data[fan.ATTR_DIRECTION] = direction
# Cover Position
elif instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
- _, position = mode.split(".")
+ position = mode.split(".")[1]
if position == cover.STATE_CLOSED:
service = cover.SERVICE_CLOSE_COVER
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index 995a6a6ef86..4668b1da6eb 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -125,7 +125,7 @@ class BMWConnectedDriveSensor(Entity):
@property
def unit_of_measurement(self) -> str:
"""Get the unit of measurement."""
- _, unit = self._attribute_info.get(self._attribute, [None, None])
+ unit = self._attribute_info.get(self._attribute, [None, None])[1]
return unit
@property
diff --git a/homeassistant/components/broadlink/config_flow.py b/homeassistant/components/broadlink/config_flow.py
index e1a294d746d..a2e770d6c4f 100644
--- a/homeassistant/components/broadlink/config_flow.py
+++ b/homeassistant/components/broadlink/config_flow.py
@@ -41,8 +41,8 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
"""Define a device for the config flow."""
supported_types = {
device_type
- for _, device_types in DOMAINS_AND_TYPES
- for device_type in device_types
+ for device_types in DOMAINS_AND_TYPES
+ for device_type in device_types[1]
}
if device.type not in supported_types:
_LOGGER.error(
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index 97956965b66..b76dbcaf20b 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -601,7 +601,7 @@ class CastDevice(MediaPlayerEntity):
@property
def state(self):
"""Return the state of the player."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
if media_status is None:
return None
@@ -633,13 +633,13 @@ class CastDevice(MediaPlayerEntity):
@property
def media_content_id(self):
"""Content ID of current playing media."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.content_id if media_status else None
@property
def media_content_type(self):
"""Content type of current playing media."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
if media_status is None:
return None
if media_status.media_is_tvshow:
@@ -653,13 +653,13 @@ class CastDevice(MediaPlayerEntity):
@property
def media_duration(self):
"""Duration of current playing media in seconds."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.duration if media_status else None
@property
def media_image_url(self):
"""Image url of current playing media."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
if media_status is None:
return None
@@ -677,49 +677,49 @@ class CastDevice(MediaPlayerEntity):
@property
def media_title(self):
"""Title of current playing media."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.title if media_status else None
@property
def media_artist(self):
"""Artist of current playing media (Music track only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.artist if media_status else None
@property
def media_album_name(self):
"""Album of current playing media (Music track only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.album_name if media_status else None
@property
def media_album_artist(self):
"""Album artist of current playing media (Music track only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.album_artist if media_status else None
@property
def media_track(self):
"""Track number of current playing media (Music track only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.track if media_status else None
@property
def media_series_title(self):
"""Return the title of the series of current playing media."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.series_title if media_status else None
@property
def media_season(self):
"""Season of current playing media (TV Show only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.season if media_status else None
@property
def media_episode(self):
"""Episode of current playing media (TV Show only)."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
return media_status.episode if media_status else None
@property
@@ -736,7 +736,7 @@ class CastDevice(MediaPlayerEntity):
def supported_features(self):
"""Flag media player features that are supported."""
support = SUPPORT_CAST
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
if media_status:
if media_status.supports_queue_next:
@@ -754,7 +754,7 @@ class CastDevice(MediaPlayerEntity):
@property
def media_position(self):
"""Position of current playing media in seconds."""
- media_status, _ = self._media_status()
+ media_status = self._media_status()[0]
if media_status is None or not (
media_status.player_is_playing
or media_status.player_is_paused
@@ -769,7 +769,7 @@ class CastDevice(MediaPlayerEntity):
Returns value from homeassistant.util.dt.utcnow().
"""
- _, media_status_recevied = self._media_status()
+ media_status_recevied = self._media_status()[1]
return media_status_recevied
@property
diff --git a/homeassistant/components/doorbird/logbook.py b/homeassistant/components/doorbird/logbook.py
index c7ed802b7ea..a4889360d81 100644
--- a/homeassistant/components/doorbird/logbook.py
+++ b/homeassistant/components/doorbird/logbook.py
@@ -13,7 +13,7 @@ def async_describe_events(hass, async_describe_event):
@callback
def async_describe_logbook_event(event):
"""Describe a logbook event."""
- _, doorbird_event = event.event_type.split("_", 1)
+ doorbird_event = event.event_type.split("_", 1)[1]
return {
"name": "Doorbird",
diff --git a/homeassistant/components/mysensors/sensor.py b/homeassistant/components/mysensors/sensor.py
index 6a6e95ddd01..bab6bf3fc40 100644
--- a/homeassistant/components/mysensors/sensor.py
+++ b/homeassistant/components/mysensors/sensor.py
@@ -85,7 +85,7 @@ class MySensorsSensor(mysensors.device.MySensorsEntity):
@property
def icon(self):
"""Return the icon to use in the frontend, if any."""
- _, icon = self._get_sensor_type()
+ icon = self._get_sensor_type()[1]
return icon
@property
@@ -97,7 +97,7 @@ class MySensorsSensor(mysensors.device.MySensorsEntity):
and set_req.V_UNIT_PREFIX in self._values
):
return self._values[set_req.V_UNIT_PREFIX]
- unit, _ = self._get_sensor_type()
+ unit = self._get_sensor_type()[0]
return unit
def _get_sensor_type(self):
diff --git a/homeassistant/components/scsgate/__init__.py b/homeassistant/components/scsgate/__init__.py
index f64106049de..6a190e64b7d 100644
--- a/homeassistant/components/scsgate/__init__.py
+++ b/homeassistant/components/scsgate/__init__.py
@@ -131,7 +131,7 @@ class SCSGate:
with self._devices_to_register_lock:
while self._devices_to_register:
- _, device = self._devices_to_register.popitem()
+ device = self._devices_to_register.popitem()[1]
self._devices[device.scs_id] = device
self._device_being_registered = device.scs_id
self._reactor.append_task(GetStatusTask(target=device.scs_id))
diff --git a/homeassistant/components/unifi/controller.py b/homeassistant/components/unifi/controller.py
index 4d5bfa20215..a4435ccfecf 100644
--- a/homeassistant/components/unifi/controller.py
+++ b/homeassistant/components/unifi/controller.py
@@ -345,9 +345,9 @@ class UniFiController:
mac = ""
if entity.domain == TRACKER_DOMAIN:
- mac, _ = entity.unique_id.split("-", 1)
+ mac = entity.unique_id.split("-", 1)[0]
elif entity.domain == SWITCH_DOMAIN:
- _, mac = entity.unique_id.split("-", 1)
+ mac = entity.unique_id.split("-", 1)[1]
if mac in self.api.clients or mac not in self.api.clients_all:
continue
diff --git a/homeassistant/components/xbox/media_source.py b/homeassistant/components/xbox/media_source.py
index 5615e11ea7f..750300e49ee 100644
--- a/homeassistant/components/xbox/media_source.py
+++ b/homeassistant/components/xbox/media_source.py
@@ -84,7 +84,7 @@ class XboxSource(MediaSource):
async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
"""Resolve media to a url."""
_, category, url = async_parse_identifier(item)
- _, kind = category.split("#", 1)
+ kind = category.split("#", 1)[1]
return PlayMedia(url, MIME_TYPE_MAP[kind])
async def async_browse_media(
@@ -267,7 +267,7 @@ def _build_categories(title):
def _build_media_item(title: str, category: str, item: XboxMediaItem):
"""Build individual media item."""
- _, kind = category.split("#", 1)
+ kind = category.split("#", 1)[1]
return BrowseMediaSource(
domain=DOMAIN,
identifier=f"{title}~~{category}~~{item.uri}",