Merge pull request #15214 from anntzer/wxicons

QuLogic · web-flow · commit b160322da0d8 · 2020-04-14T00:22:22.000-04:00
Inline wx icon loading.
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1081,25 +1081,16 @@ def resize(self, width, height):
 
 def _load_bitmap(filename):
     """
-    Load a bitmap file from the backends/images subdirectory in which the
-    matplotlib library is installed. The filename parameter should not
-    contain any path information as this is determined automatically.
-
-    Returns a wx.Bitmap object.
+    Load a wx.Bitmap from a file in the "images" directory of the Matplotlib
+    data.
     """
-    path = cbook._get_data_path('images', filename)
-    if not path.exists():
-        raise IOError(f"Could not find bitmap file '{path}'; dying")
-    return wx.Bitmap(str(path))
+    return wx.Bitmap(str(cbook._get_data_path('images', filename)))
 
 
 def _set_frame_icon(frame):
     bundle = wx.IconBundle()
     for image in ('matplotlib.png', 'matplotlib_large.png'):
-        try:
-            icon = wx.Icon(_load_bitmap(image))
-        except IOError:
-            continue
+        icon = wx.Icon(_load_bitmap(image))
         if not icon.IsOk():
             return
         bundle.AddIcon(icon)
@@ -1144,7 +1135,7 @@ def _init_toolbar(self):
             self.wx_ids[text] = (
                 self.AddTool(
                     -1,
-                    bitmap=_load_bitmap(image_file + ".png"),
+                    bitmap=_load_bitmap(f"{image_file}.png"),
                     bmpDisabled=wx.NullBitmap,
                     label=text, shortHelp=text, longHelp=tooltip_text,
                     kind=(wx.ITEM_CHECK if text in ["Pan", "Zoom"]
@@ -1325,8 +1316,7 @@ def set_history_buttons(self):
 class StatusBarWx(wx.StatusBar):
     """
     A status bar is added to _FigureFrame to allow measurements and the
-    previously selected scroll function to be displayed as a user
-    convenience.
+    previously selected scroll function to be displayed as a user convenience.
     """
 
     def __init__(self, parent, *args, **kwargs):
@@ -1356,7 +1346,7 @@ def add_toolitem(self, name, group, position, image_file, description,
             tool = self.InsertTool(idx, -1, name, bmp, wx.NullBitmap, kind,
                                    description or "")
         else:
-            size = (self.GetTextExtent(name)[0]+10, -1)
+            size = (self.GetTextExtent(name)[0] + 10, -1)
             if toggle:
                 control = wx.ToggleButton(self, -1, name, size=size)
             else:
