From 198b18dd0004ffbc93efb142b375b3f582d1944e Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Sun, 14 Nov 2021 11:06:27 -0700
Subject: [PATCH] Perform some OpenUV code cleanup (#58864)

---
 homeassistant/components/openuv/__init__.py      | 11 ++++-------
 homeassistant/components/openuv/binary_sensor.py | 10 ++--------
 homeassistant/components/openuv/const.py         |  1 -
 homeassistant/components/openuv/sensor.py        |  3 +--
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/homeassistant/components/openuv/__init__.py b/homeassistant/components/openuv/__init__.py
index e38d95a6101..20ef5211c23 100644
--- a/homeassistant/components/openuv/__init__.py
+++ b/homeassistant/components/openuv/__init__.py
@@ -9,7 +9,6 @@ from pyopenuv.errors import OpenUvError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_ATTRIBUTION,
     CONF_API_KEY,
     CONF_BINARY_SENSORS,
     CONF_ELEVATION,
@@ -30,7 +29,6 @@ from homeassistant.helpers.service import verify_domain_control
 from .const import (
     CONF_FROM_WINDOW,
     CONF_TO_WINDOW,
-    DATA_CLIENT,
     DATA_PROTECTION_WINDOW,
     DATA_UV,
     DEFAULT_FROM_WINDOW,
@@ -51,9 +49,6 @@ PLATFORMS = ["binary_sensor", "sensor"]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up OpenUV as config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {}
-
     _verify_domain_control = verify_domain_control(hass, DOMAIN)
 
     try:
@@ -73,7 +68,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         LOGGER.error("Config entry failed: %s", err)
         raise ConfigEntryNotReady from err
 
-    hass.data[DOMAIN][entry.entry_id][DATA_CLIENT] = openuv
+    hass.data.setdefault(DOMAIN, {})
+    hass.data[DOMAIN][entry.entry_id] = openuv
+
     hass.config_entries.async_setup_platforms(entry, PLATFORMS)
 
     @_verify_domain_control
@@ -175,7 +172,7 @@ class OpenUvEntity(Entity):
 
     def __init__(self, openuv: OpenUV, description: EntityDescription) -> None:
         """Initialize."""
-        self._attr_extra_state_attributes = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
+        self._attr_extra_state_attributes = {}
         self._attr_should_poll = False
         self._attr_unique_id = (
             f"{openuv.client.latitude}_{openuv.client.longitude}_{description.key}"
diff --git a/homeassistant/components/openuv/binary_sensor.py b/homeassistant/components/openuv/binary_sensor.py
index 913d844a7c3..503d82d32f2 100644
--- a/homeassistant/components/openuv/binary_sensor.py
+++ b/homeassistant/components/openuv/binary_sensor.py
@@ -9,13 +9,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import as_local, parse_datetime, utcnow
 
 from . import OpenUvEntity
-from .const import (
-    DATA_CLIENT,
-    DATA_PROTECTION_WINDOW,
-    DOMAIN,
-    LOGGER,
-    TYPE_PROTECTION_WINDOW,
-)
+from .const import DATA_PROTECTION_WINDOW, DOMAIN, LOGGER, TYPE_PROTECTION_WINDOW
 
 ATTR_PROTECTION_WINDOW_ENDING_TIME = "end_time"
 ATTR_PROTECTION_WINDOW_ENDING_UV = "end_uv"
@@ -33,7 +27,7 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up an OpenUV sensor based on a config entry."""
-    openuv = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
+    openuv = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
         [OpenUvBinarySensor(openuv, BINARY_SENSOR_DESCRIPTION_PROTECTION_WINDOW)]
     )
diff --git a/homeassistant/components/openuv/const.py b/homeassistant/components/openuv/const.py
index 975511c7297..b03726d5749 100644
--- a/homeassistant/components/openuv/const.py
+++ b/homeassistant/components/openuv/const.py
@@ -7,7 +7,6 @@ LOGGER = logging.getLogger(__package__)
 CONF_FROM_WINDOW = "from_window"
 CONF_TO_WINDOW = "to_window"
 
-DATA_CLIENT = "data_client"
 DATA_PROTECTION_WINDOW = "protection_window"
 DATA_UV = "uv"
 
diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py
index bcfac6e3684..0660ca740ac 100644
--- a/homeassistant/components/openuv/sensor.py
+++ b/homeassistant/components/openuv/sensor.py
@@ -14,7 +14,6 @@ from homeassistant.util.dt import as_local, parse_datetime
 
 from . import OpenUvEntity
 from .const import (
-    DATA_CLIENT,
     DATA_UV,
     DOMAIN,
     TYPE_CURRENT_OZONE_LEVEL,
@@ -122,7 +121,7 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up a OpenUV sensor based on a config entry."""
-    openuv = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT]
+    openuv = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
         [OpenUvSensor(openuv, description) for description in SENSOR_DESCRIPTIONS]
     )