using class attribute for icon extension

fariza · fariza · commit 76a2cd4fa879 · 2017-11-19T13:28:40.000-05:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -3270,24 +3270,26 @@ def _get_image_filename(self, image):
             return None
 
         basedir = os.path.join(rcParams['datapath'], 'images')
-        possible_images = [
+        possible_images = (
             image,
-            image + self.btn_image_extension(),
-            os.path.join(basedir, image) + self.btn_image_extension()]
+            image + self._icon_extension,
+            os.path.join(basedir, image),
+            os.path.join(basedir, image) + self._icon_extension)
 
         for fname in possible_images:
             if os.path.isfile(fname):
                 return fname
 
-    def btn_image_extension(self):
+    @property
+    def _icon_extension(self):
         """
         Get the button image format extension
 
         Returns
         =======
         str: Image extension
         """
-        raise NotImplementedError
+        raise AttributeError
 
 
     def trigger_tool(self, name):
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -712,6 +712,7 @@ def draw_rubberband(self, x0, y0, x1, y1):
 
 
 class ToolbarGTK3(ToolContainerBase, Gtk.Box):
+    _icon_extension = '.png'
     def __init__(self, toolmanager):
         ToolContainerBase.__init__(self, toolmanager)
         Gtk.Box.__init__(self)
@@ -786,9 +787,6 @@ def _add_separator(self):
         self._toolarea.pack_start(sep, False, True, 0)
         sep.show_all()
 
-    def btn_image_extension(self):
-        return '.png'
-
 
 class StatusbarGTK3(StatusbarBase, Gtk.Statusbar):
     def __init__(self, *args, **kwargs):
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -868,6 +868,7 @@ def set_cursor(self, cursor):
 
 
 class ToolbarTk(ToolContainerBase, Tk.Frame):
+    _icon_extension = '.gif'
     def __init__(self, toolmanager, window):
         ToolContainerBase.__init__(self, toolmanager)
         xmin, xmax = self.toolmanager.canvas.figure.bbox.intervalx
@@ -935,9 +936,6 @@ def remove_toolitem(self, name):
             toolitem.pack_forget()
         del self._toolitems[name]
 
-    def btn_image_extension(self):
-        return '.gif'
-
 
 class StatusbarTk(StatusbarBase, Tk.Frame):
     def __init__(self, window, *args, **kwargs):
