From 74a44e03fa2e917e07bbe7e5fd3eb6f9d77dc8fc Mon Sep 17 00:00:00 2001
From: jpcornil-git <40644331+jpcornil-git@users.noreply.github.com>
Date: Tue, 26 Jan 2021 22:19:10 +0100
Subject: [PATCH] Extend add_update_listener support to bound methods (#44238)

---
 homeassistant/config_entries.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 0580b91929c..abc6b2f46af 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -2,7 +2,7 @@
 import asyncio
 import functools
 import logging
-from types import MappingProxyType
+from types import MappingProxyType, MethodType
 from typing import Any, Callable, Dict, List, Optional, Set, Union, cast
 import weakref
 
@@ -181,7 +181,9 @@ class ConfigEntry:
         self.supports_unload = False
 
         # Listeners to call on update
-        self.update_listeners: List[weakref.ReferenceType[UpdateListenerType]] = []
+        self.update_listeners: List[
+            Union[weakref.ReferenceType[UpdateListenerType], weakref.WeakMethod]
+        ] = []
 
         # Function to cancel a scheduled retry
         self._async_cancel_retry_setup: Optional[Callable[[], Any]] = None
@@ -414,7 +416,12 @@ class ConfigEntry:
 
         Returns function to unlisten.
         """
-        weak_listener = weakref.ref(listener)
+        weak_listener: Any
+        # weakref.ref is not applicable to a bound method, e.g. method of a class instance, as reference will die immediately
+        if hasattr(listener, "__self__"):
+            weak_listener = weakref.WeakMethod(cast(MethodType, listener))
+        else:
+            weak_listener = weakref.ref(listener)
         self.update_listeners.append(weak_listener)
 
         return lambda: self.update_listeners.remove(weak_listener)