Skip to content

Deprecate original NavigationToolbar #1388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2012
Merged

Deprecate original NavigationToolbar #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df751c4
Deprecate original NavigationToolbar
efiring Oct 13, 2012
8ff5030
Note deprecation of classic toolbar in api_changes and matplotlibrc.t…
efiring Oct 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/api/api_changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
14 changes: 11 additions & 3 deletions lib/matplotlib/rcsetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_autolayout(v):
if v:
Expand Down
2 changes: 1 addition & 1 deletion matplotlibrc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down