Merge pull request #23495 from QuLogic/fix-sgskip

timhoffm · web-flow · commit cd66bfd35038 · 2022-07-30T03:15:04.000+02:00
Fix sgskip'd examples
diff --git a/examples/misc/image_thumbnail_sgskip.py b/examples/misc/image_thumbnail_sgskip.py
@@ -20,7 +20,7 @@
     description="Build thumbnails of all images in a directory.")
 parser.add_argument("imagedir", type=Path)
 args = parser.parse_args()
-if not args.imagedir.isdir():
+if not args.imagedir.is_dir():
     sys.exit(f"Could not find input directory {args.imagedir}")
 
 outdir = Path("thumbs")
diff --git a/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py b/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py
@@ -36,7 +36,7 @@
 vbox.pack_start(canvas, True, True, 0)
 
 # Create toolbar
-toolbar = NavigationToolbar(canvas, win)
+toolbar = NavigationToolbar(canvas)
 vbox.pack_start(toolbar, False, False, 0)
 
 win.show_all()
diff --git a/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py b/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py
@@ -39,7 +39,7 @@ def on_activate(app):
     vbox.append(canvas)
 
     # Create toolbar
-    toolbar = NavigationToolbar(canvas, win)
+    toolbar = NavigationToolbar(canvas)
     vbox.append(toolbar)
 
     win.show()
diff --git a/examples/user_interfaces/embedding_in_wx5_sgskip.py b/examples/user_interfaces/embedding_in_wx5_sgskip.py
@@ -9,7 +9,7 @@
 import wx.lib.agw.aui as aui
 import wx.lib.mixins.inspection as wit
 
-import matplotlib as mpl
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_wxagg import (
     FigureCanvasWxAgg as FigureCanvas,
     NavigationToolbar2WxAgg as NavigationToolbar)
@@ -18,7 +18,7 @@
 class Plot(wx.Panel):
     def __init__(self, parent, id=-1, dpi=None, **kwargs):
         super().__init__(parent, id=id, **kwargs)
-        self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2))
+        self.figure = Figure(dpi=dpi, figsize=(2, 2))
         self.canvas = FigureCanvas(self, -1, self.figure)
         self.toolbar = NavigationToolbar(self.canvas)
         self.toolbar.Realize()
diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/examples/user_interfaces/fourier_demo_wx_sgskip.py
@@ -75,10 +75,10 @@ def __init__(self, parent, label, param):
 
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add(self.sliderLabel, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL,
+                  wx.EXPAND | wx.ALL,
                   border=2)
         sizer.Add(self.sliderText, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL,
+                  wx.EXPAND | wx.ALL,
                   border=2)
         sizer.Add(self.slider, 1, wx.EXPAND)
         self.sizer = sizer
@@ -115,9 +115,9 @@ def __init__(self, *args, **kwargs):
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.canvas, 1, wx.EXPAND)
         sizer.Add(self.frequencySliderGroup.sizer, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
+                  wx.EXPAND | wx.ALL, border=5)
         sizer.Add(self.amplitudeSliderGroup.sizer, 0,
-                  wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, border=5)
+                  wx.EXPAND | wx.ALL, border=5)
         panel.SetSizer(sizer)
 
     def createCanvas(self, parent):
diff --git a/examples/user_interfaces/mathtext_wx_sgskip.py b/examples/user_interfaces/mathtext_wx_sgskip.py
@@ -15,7 +15,6 @@
 import numpy as np
 import wx
 
-IS_GTK = 'wxGTK' in wx.PlatformInfo
 IS_WIN = 'wxMSW' in wx.PlatformInfo
 
 
@@ -66,7 +65,7 @@ def __init__(self, parent, title):
         menuBar.Append(menu, "&File")
         self.Bind(wx.EVT_MENU, self.OnClose, m_exit)
 
-        if IS_GTK or IS_WIN:
+        if IS_WIN:
             # Equation Menu
             menu = wx.Menu()
             for i, (mt, func) in enumerate(functions):
