fariza
diff --git a/‎lib/matplotlib/cbook.py
Lines changed: 25 additions & 10 deletions b/‎lib/matplotlib/cbook.py
Lines changed: 25 additions & 10 deletions
@@ -361,9 +361,11 @@ class _BoundMethodProxy(object):
     Minor bugfixes by Michael Droettboom
     '''
     def __init__(self, cb):
+        self._hash = hash(cb)
+        self._callbacks = []
         try:
             try:
-                self.inst = ref(cb.im_self)
+                self.inst = ref(cb.im_self, self._destroy)
             except TypeError:
                 self.inst = None
             if six.PY3:
@@ -377,6 +379,13 @@ def __init__(self, cb):
             self.func = cb
             self.klass = None
 
+    def add_callback(self, callback):
+        self._callbacks.append(_BoundMethodProxy(callback))
+
+    def _destroy(self, wk):
+        for callback in self._callbacks:
+            callback(self)
+
     def __getstate__(self):
         d = self.__dict__.copy()
         # de-weak reference inst
@@ -433,6 +442,9 @@ def __ne__(self, other):
         '''
         return not self.__eq__(other)
 
+    def __hash__(self):
+        return self._hash
+
 
 class CallbackRegistry(object):
     """
@@ -492,17 +504,24 @@ def connect(self, s, func):
         func will be called
         """
         self._func_cid_map.setdefault(s, WeakKeyDictionary())
-        if func in self._func_cid_map[s]:
-            return self._func_cid_map[s][func]
+        proxy = _BoundMethodProxy(func)
+        if proxy in self._func_cid_map[s]:
+            return self._func_cid_map[s][proxy]
 
+        proxy.add_callback(self.remove_proxy)
         self._cid += 1
         cid = self._cid
-        self._func_cid_map[s][func] = cid
+        self._func_cid_map[s][proxy] = cid
         self.callbacks.setdefault(s, dict())
-        proxy = _BoundMethodProxy(func)
         self.callbacks[s][cid] = proxy
         return cid
 
+    def remove_proxy(self, proxy):
+        """Removes a dead proxy as soon as it dies"""
+        for category, proxies in list(six.iteritems(self._func_cid_map)):
+            if proxy in proxies:
+                del self.callbacks[category][proxies[proxy]]
+
     def disconnect(self, cid):
         """
         disconnect the callback registered with callback id *cid*
@@ -527,11 +546,7 @@ def process(self, s, *args, **kwargs):
         """
         if s in self.callbacks:
             for cid, proxy in list(six.iteritems(self.callbacks[s])):
-                # Clean out dead references
-                if proxy.inst is not None and proxy.inst() is None:
-                    del self.callbacks[s][cid]
-                else:
-                    proxy(*args, **kwargs)
+                proxy(*args, **kwargs)
 
 
 class Scheduler(threading.Thread):