Address corrections in related PRs

Address corrections in PR #42, #43, #44
custom-components · Oct 9, 2023 · 0d407df · 0d407df
1 parent f472026
commit 0d407df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/custom_components/healthchecksio/__init__.py b/custom_components/healthchecksio/__init__.py
@@ -116,8 +116,7 @@ async def async_unload_entry(
             curr_plat,
         )
     if unload_ok:
-        hass.data[DOMAIN_DATA].pop(DATA_CLIENT, None)
-        hass.data[DOMAIN_DATA].pop(DATA_DATA, None)
+        hass.data.pop(DOMAIN_DATA, None)
         _LOGGER.info("Successfully removed the HealthChecks.io integration")
 
     return unload_ok
@@ -166,12 +165,10 @@ async def update_data(self):
         else:
             _LOGGER.debug("Send Check is not defined")
         try:
-            async with session.get(
-                f"{self.site_root}/api/v1/checks/",
-                headers=headers,
-                timeout=timeout10,
-            ) as data:
-                self.hass.data[DOMAIN_DATA][DATA_DATA] = await data.json()
+            data = await session.get(
+                f"{self.site_root}/api/v1/checks/", headers=headers, timeout=timeout10
+            )
+            self.hass.data[DOMAIN_DATA][DATA_DATA] = await data.json()
         except (aiohttp.ClientError, asyncio.TimeoutError) as error:
             _LOGGER.error(f"Could Not Update Data: {error}")
         except (ValueError, json.decoder.JSONDecodeError) as error:

diff --git a/custom_components/healthchecksio/config_flow.py b/custom_components/healthchecksio/config_flow.py
@@ -64,25 +64,22 @@ async def _test_credentials(
     else:
         _LOGGER.debug("Send Check is not defined")
     try:
-        async with session.get(
-            f"{site_root}/api/v1/checks/",
-            headers=headers,
-            timeout=timeout10,
-        ) as data:
-            hass.data[DOMAIN_DATA] = {"data": await data.json()}
+        data = await session.get(
+            f"{site_root}/api/v1/checks/", headers=headers, timeout=timeout10
+        )
+        hass.data[DOMAIN_DATA] = {"data": await data.json()}
     except (aiohttp.ClientError, asyncio.TimeoutError) as error:
         _LOGGER.error(f"Could Not Update Data: {error}")
         return False
     except (ValueError, json.decoder.JSONDecodeError) as error:
         _LOGGER.error(f"Data JSON Decode Error: {error}")
         return False
     else:
-        if data.ok:
-            _LOGGER.debug(f"Get Data HTTP Status Code: {data.status}")
-            return True
-        else:
+        if not data.ok:
             _LOGGER.error(f"Error: Get Data HTTP Status Code: {data.status}")
             return False
+        _LOGGER.debug(f"Get Data HTTP Status Code: {data.status}")
+        return True
 
 
 class HealchecksioConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):