ensure Toolbar alias, but with deprecation warning

DietmarSchwertberger · DietmarSchwertberger · commit deeeeb6cea80 · 2018-02-18T00:12:20.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, deprecated
+from matplotlib.cbook import is_writable_file_like, warn_deprecated
 from matplotlib.figure import Figure
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
@@ -1474,7 +1474,7 @@ def updateButtonText(self, lst):
 }
 
 
-@deprecated("2.2")
+@cbook.deprecated("2.2")
 class SubplotToolWX(wx.Frame):
     def __init__(self, targetfig):
         wx.Frame.__init__(self, None, -1, "Configure subplots")
@@ -1700,6 +1700,11 @@ def set_history_buttons(self):
         self.EnableTool(self.wx_ids['Forward'], can_forward)
 
 
+@cbook.deprecated("2.2", alternative="NavigationToolbar2Wx")
+class Toolbar(NavigationToolbar2Wx):
+    pass
+
+
 class StatusBarWx(wx.StatusBar):
     """
     A status bar is added to _FigureFrame to allow measurements and the
@@ -1957,15 +1962,6 @@ def OnPrintPage(self, page):
         return True
 # >
 
-########################################################################
-#
-# Now just provide the standard names that backend.__init__ is expecting
-#
-########################################################################
-
-
-Toolbar = NavigationToolbar2Wx
-
 
 @_Backend.export
 class _BackendWx(_Backend):
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -6,6 +6,7 @@
 import wx
 
 import matplotlib
+from matplotlib import cbook
 from . import wx_compat as wxc
 from .backend_agg import FigureCanvasAgg
 from .backend_wx import (
@@ -71,6 +72,11 @@ def blit(self, bbox=None):
     filetypes = FigureCanvasAgg.filetypes
 
 
+@cbook.deprecated("2.2", alternative="NavigationToolbar2WxAgg")
+class Toolbar(NavigationToolbar2WxAgg):
+    pass
+
+
 # agg/wxPython image conversion functions (wxPython >= 2.8)
 
 def _convert_agg_to_wx_image(agg, bbox):
