From 8b47faa840c0acbb8039bfb5851b3133260c6865 Mon Sep 17 00:00:00 2001
From: Chris Talkington <chris@talkingtontech.com>
Date: Sun, 27 Jun 2021 15:58:49 -0500
Subject: [PATCH] Remove undo listener variable in cloudflare (#52227)

* remove undo listener variable in cloudflare

* Update const.py

* Update __init__.py

* Update __init__.py
---
 homeassistant/components/cloudflare/__init__.py | 17 +++++------------
 homeassistant/components/cloudflare/const.py    |  3 ---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/cloudflare/__init__.py b/homeassistant/components/cloudflare/__init__.py
index e461e34c9a25..ed4c54966cf1 100644
--- a/homeassistant/components/cloudflare/__init__.py
+++ b/homeassistant/components/cloudflare/__init__.py
@@ -19,13 +19,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 
-from .const import (
-    CONF_RECORDS,
-    DATA_UNDO_UPDATE_INTERVAL,
-    DEFAULT_UPDATE_INTERVAL,
-    DOMAIN,
-    SERVICE_UPDATE_RECORDS,
-)
+from .const import CONF_RECORDS, DEFAULT_UPDATE_INTERVAL, DOMAIN, SERVICE_UPDATE_RECORDS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -64,12 +58,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             _LOGGER.error("Error updating zone %s: %s", entry.data[CONF_ZONE], error)
 
     update_interval = timedelta(minutes=DEFAULT_UPDATE_INTERVAL)
-    undo_interval = async_track_time_interval(hass, update_records, update_interval)
+    entry.async_on_unload(
+        async_track_time_interval(hass, update_records, update_interval)
+    )
 
     hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {
-        DATA_UNDO_UPDATE_INTERVAL: undo_interval,
-    }
+    hass.data[DOMAIN][entry.entry_id] = {}
 
     hass.services.async_register(DOMAIN, SERVICE_UPDATE_RECORDS, update_records_service)
 
@@ -78,7 +72,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Cloudflare config entry."""
-    hass.data[DOMAIN][entry.entry_id][DATA_UNDO_UPDATE_INTERVAL]()
     hass.data[DOMAIN].pop(entry.entry_id)
 
     return True
diff --git a/homeassistant/components/cloudflare/const.py b/homeassistant/components/cloudflare/const.py
index 0bdce7b9a92c..4952b3768b0d 100644
--- a/homeassistant/components/cloudflare/const.py
+++ b/homeassistant/components/cloudflare/const.py
@@ -5,9 +5,6 @@ DOMAIN = "cloudflare"
 # Config
 CONF_RECORDS = "records"
 
-# Data
-DATA_UNDO_UPDATE_INTERVAL = "undo_update_interval"
-
 # Defaults
 DEFAULT_UPDATE_INTERVAL = 60  # in minutes