FIX: also remove discarded cid from self._pickled_cids

tacaswell · tacaswell · commit eed690688e6e · 2021-02-18T18:00:35.000-05:00
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -220,6 +220,7 @@ def _remove_proxy(self, proxy, *, _is_finalizing=sys.is_finalizing):
             cid = proxy_to_cid.pop(proxy, None)
             if cid is not None:
                 del self.callbacks[signal][cid]
+                self._pickled_cids.discard(cid)
                 break
         else:
             # Not found
@@ -235,6 +236,7 @@ def disconnect(self, cid):
 
         No error is raised if such a callback does not exist.
         """
+        self._pickled_cids.discard(cid)
         # Clean up callbacks
         for signal, cid_to_proxy in list(self.callbacks.items()):
             proxy = cid_to_proxy.pop(cid, None)
