Merge branch 'v1.1.x' of github.com:matplotlib/matplotlib into v1.1.x

mdboom · mdboom · commit 04a69f01d971 · 2012-03-20T09:56:16.000-04:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -240,6 +240,9 @@ def disconnect(self, cid):
         for eventname, callbackd in self.callbacks.items():
             try:
                 del callbackd[cid]
+                for key, value in self._func_cid_map.items():
+                    if value == cid:
+                        del self._func_cid_map[key]
             except KeyError:
                 continue
             else:
