Clean up dicts the same way with _remove_proxy or disconnect

vallsv · vallsv · commit ab10d45a6340 · 2021-02-15T13:56:49.000+01:00
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -224,6 +224,7 @@ def _remove_proxy(self, proxy, *, _is_finalizing=sys.is_finalizing):
         else:
             # Not found
             return
+        # Clean up empty dicts
         if len(self.callbacks[signal]) == 0:
             del self.callbacks[signal]
             del self._func_cid_map[signal]
@@ -248,6 +249,10 @@ def disconnect(self, cid):
             if current_cid == cid:
                 assert proxy is current_proxy
                 del proxy_to_cid[current_proxy]
+        # Clean up empty dicts
+        if len(self.callbacks[signal]) == 0:
+            del self.callbacks[signal]
+            del self._func_cid_map[signal]
 
     def process(self, s, *args, **kwargs):
         """
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -226,7 +226,6 @@ def test_callback_complete(self):
         # check we now have no callbacks registered
         self.is_empty()
 
-    @pytest.mark.xfail(reason="must be fixed")
     def test_callback_disconnect(self):
         # ensure we start with an empty registry
         self.is_empty()
