update from review feedback: SubplotToolWX w. deprecation; combine import statements

DietmarSchwertberger · DietmarSchwertberger · commit 3a50249916c1 · 2018-02-17T23:32:42.000+01:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -34,7 +34,7 @@
 from matplotlib.backend_bases import _has_pil
 
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.cbook import is_writable_file_like, warn_deprecated
+from matplotlib.cbook import is_writable_file_like, warn_deprecated, deprecated
 from matplotlib.figure import Figure
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
@@ -1474,6 +1474,26 @@ def updateButtonText(self, lst):
 }
 
 
+@deprecated("2.2")
+class SubplotToolWX(wx.Frame):
+    def __init__(self, targetfig):
+        wx.Frame.__init__(self, None, -1, "Configure subplots")
+
+        toolfig = Figure((6, 3))
+        canvas = FigureCanvasWx(self, -1, toolfig)
+
+        # Create a figure manager to manage things
+        figmgr = FigureManager(canvas, 1, self)
+
+        # Now put all into a sizer
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        # This way of adding to sizer allows resizing
+        sizer.Add(canvas, 1, wx.LEFT | wx.TOP | wx.GROW)
+        self.SetSizer(sizer)
+        self.Fit()
+        tool = SubplotTool(targetfig, toolfig)
+
+
 class NavigationToolbar2Wx(NavigationToolbar2, wx.ToolBar):
     def __init__(self, canvas):
         wx.ToolBar.__init__(self, canvas.GetParent(), -1)
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -6,11 +6,11 @@
 import wx
 
 import matplotlib
-from .. import cbook
 from . import wx_compat as wxc
 from .backend_agg import FigureCanvasAgg
-from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
-from .backend_wx import NavigationToolbar2Wx as NavigationToolbar2WxAgg
+from .backend_wx import (
+    _BackendWx, _FigureCanvasWxBase, FigureFrameWx,
+    NavigationToolbar2Wx as NavigationToolbar2WxAgg)
 
 
 class FigureFrameWxAgg(FigureFrameWx):
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -6,8 +6,9 @@
 import wx
 
 from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
-from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
-from .backend_wx import NavigationToolbar2Wx as NavigationToolbar2WxCairo
+from .backend_wx import (
+    _BackendWx, _FigureCanvasWxBase, FigureFrameWx,
+    NavigationToolbar2Wx as NavigationToolbar2WxCairo)
 from . import wx_compat as wxc
 
 
