Perform some SimpliSafe code cleanup (#58867)

This commit is contained in:
Aaron Bach 2021-11-01 02:04:00 -06:00 committed by GitHub
parent d024c5e698
commit 0cc4b7219f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 15 deletions

View File

@ -80,7 +80,6 @@ from .const import (
ATTR_LIGHT,
ATTR_VOICE_PROMPT_VOLUME,
CONF_USER_ID,
DATA_CLIENT,
DOMAIN,
LOGGER,
)
@ -223,9 +222,6 @@ def _async_register_base_station(
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up SimpliSafe as config entry."""
hass.data.setdefault(DOMAIN, {})
hass.data[DOMAIN][entry.entry_id] = {}
_async_standardize_config_entry(hass, entry)
_verify_domain_control = verify_domain_control(hass, DOMAIN)
@ -248,7 +244,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
except SimplipyError as err:
raise ConfigEntryNotReady from err
hass.data[DOMAIN][entry.entry_id][DATA_CLIENT] = simplisafe
hass.data.setdefault(DOMAIN, {})
hass.data[DOMAIN][entry.entry_id] = simplisafe
hass.config_entries.async_setup_platforms(entry, PLATFORMS)
@callback

View File

@ -60,7 +60,6 @@ from .const import (
ATTR_EXIT_DELAY_HOME,
ATTR_LIGHT,
ATTR_VOICE_PROMPT_VOLUME,
DATA_CLIENT,
DOMAIN,
LOGGER,
)
@ -123,7 +122,7 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Set up a SimpliSafe alarm control panel based on a config entry."""
simplisafe = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
simplisafe = hass.data[DOMAIN][entry.entry_id]
async_add_entities(
[SimpliSafeAlarm(simplisafe, system) for system in simplisafe.systems.values()],
True,

View File

@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import SimpliSafe, SimpliSafeEntity
from .const import DATA_CLIENT, DOMAIN, LOGGER
from .const import DOMAIN, LOGGER
SUPPORTED_BATTERY_SENSOR_TYPES = [
DeviceTypes.carbon_monoxide,
@ -50,7 +50,7 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Set up SimpliSafe binary sensors based on a config entry."""
simplisafe = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
simplisafe = hass.data[DOMAIN][entry.entry_id]
sensors: list[BatteryBinarySensor | TriggeredBinarySensor] = []

View File

@ -16,5 +16,3 @@ ATTR_LIGHT = "light"
ATTR_VOICE_PROMPT_VOLUME = "voice_prompt_volume"
CONF_USER_ID = "user_id"
DATA_CLIENT = "client"

View File

@ -19,7 +19,7 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import SimpliSafe, SimpliSafeEntity
from .const import DATA_CLIENT, DOMAIN, LOGGER
from .const import DOMAIN, LOGGER
ATTR_LOCK_LOW_BATTERY = "lock_low_battery"
ATTR_PIN_PAD_LOW_BATTERY = "pin_pad_low_battery"
@ -37,7 +37,7 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Set up SimpliSafe locks based on a config entry."""
simplisafe = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
simplisafe = hass.data[DOMAIN][entry.entry_id]
locks = []
for system in simplisafe.systems.values():

View File

@ -12,14 +12,14 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import SimpliSafe, SimpliSafeEntity
from .const import DATA_CLIENT, DOMAIN, LOGGER
from .const import DOMAIN, LOGGER
async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Set up SimpliSafe freeze sensors based on a config entry."""
simplisafe = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
simplisafe = hass.data[DOMAIN][entry.entry_id]
sensors = []
for system in simplisafe.systems.values():