Improve MEP22 Tool Searching Structure

OceanWolf · tacaswell · commit b619923761e9 · 2017-06-19T00:34:01.000-04:00
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -529,14 +529,20 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
     def _get_cls_to_instantiate(self, callback_class):
         # Find the class that corresponds to the tool
         if isinstance(callback_class, six.string_types):
+            try:
+                backend = self.canvas.manager.backend
+            except:
+                backend = get_backend()
+
             # FIXME: make more complete searching structure
-            if callback_class in globals():
+            if hasattr(backend, callback_class):
+                callback_class = getattr(backend, callback_class)
+            elif callback_class in globals():
                 callback_class = globals()[callback_class]
             else:
                 mod = 'backend_tools'
                 current_module = __import__(mod,
                                             globals(), locals(), [mod], 1)
-
                 callback_class = getattr(current_module, callback_class, False)
         if callable(callback_class):
             return callback_class
