From 76e8870e989adff65ec04260e2e143d7bcdd7b25 Mon Sep 17 00:00:00 2001 From: On Freund Date: Thu, 30 Jul 2020 17:51:46 +0300 Subject: [PATCH] Clean up Volumio code (#38400) --- homeassistant/components/volumio/config_flow.py | 6 +++--- homeassistant/components/volumio/media_player.py | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/volumio/config_flow.py b/homeassistant/components/volumio/config_flow.py index 8b68a4d38de..950a161a5c3 100644 --- a/homeassistant/components/volumio/config_flow.py +++ b/homeassistant/components/volumio/config_flow.py @@ -71,9 +71,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): errors = {} if user_input is not None: info = None + self._host = user_input[CONF_HOST] + self._port = user_input[CONF_PORT] try: - self._host = user_input[CONF_HOST] - self._port = user_input[CONF_PORT] info = await validate_input(self.hass, self._host, self._port) except CannotConnect: errors["base"] = "cannot_connect" @@ -83,7 +83,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): if info is not None: self._name = info.get("name", self._host) - self._uuid = info.get("id", None) + self._uuid = info.get("id") if self._uuid is not None: await self._set_uid_and_abort() diff --git a/homeassistant/components/volumio/media_player.py b/homeassistant/components/volumio/media_player.py index 0fadb5b51ed..d471f283ef1 100644 --- a/homeassistant/components/volumio/media_player.py +++ b/homeassistant/components/volumio/media_player.py @@ -63,16 +63,15 @@ async def async_setup_entry(hass, config_entry, async_add_entities): uid = config_entry.data[CONF_ID] name = config_entry.data[CONF_NAME] - entity = Volumio(hass, volumio, uid, name, info) + entity = Volumio(volumio, uid, name, info) async_add_entities([entity]) class Volumio(MediaPlayerEntity): """Volumio Player Object.""" - def __init__(self, hass, volumio, uid, name, info): + def __init__(self, volumio, uid, name, info): """Initialize the media player.""" - self._hass = hass self._volumio = volumio self._uid = uid self._name = name