Merge pull request matplotlib#1388 from efiring/deprecate_Toolbar

Deprecate original NavigationToolbar

Author: efiring

doc/api/api_changes.rst

@@ -14,6 +14,9 @@ For new features that were added to matplotlib, please see
 Changes in 1.2.x
 ================
 
+* The ``classic`` option of the rc parameter ``toolbar`` is deprecated
+  and will be removed in the next release.
+
 * The :meth:`~matplotlib.cbook.isvector` method has been removed since it
   is no longer functional.
 

lib/matplotlib/rcsetup.py

@@ -110,9 +110,17 @@ def validate_backend(s):
 
 validate_qt4 = ValidateInStrings('backend.qt4', ['PyQt4', 'PySide'])
 
-validate_toolbar = ValidateInStrings('toolbar',[
-    'None','classic','toolbar2',
-    ], ignorecase=True)
+def validate_toolbar(s):
+    validator = ValidateInStrings(
+                'toolbar',
+                ['None','classic','toolbar2'],
+                ignorecase=True)
+    s = validator(s)
+    if s.lower == 'classic':
+        warnings.warn("'classic' Navigation Toolbar "
+                      "is deprecated in v1.2.x and will be "
+                      "removed in v1.3")
+    return s
 
 def validate_maskedarray(v):
     # 2008/12/12: start warning; later, remove all traces of maskedarray

matplotlibrc.template

@@ -47,7 +47,7 @@ backend      : %(backend)s
 #backend_fallback: True
 
 #interactive  : False
-#toolbar      : toolbar2   # None | classic | toolbar2
+#toolbar      : toolbar2   # None | toolbar2  ("classic" is deprecated)
 #timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
 
 # Where your matplotlib data lives if you installed to a non-default