Skip to content

Fix #5777. Don't warn when applying default style #5778

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
jenshnielsen merged 3 commits into from
Jan 5, 2016
Merged

Fix #5777. Don't warn when applying default style #5778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21b129f
Fix #5777. Don't warn when applying default style
mdboom Jan 1, 2016
0a35fe4
Don't use catch_warnings
mdboom Jan 4, 2016
c515a9d
Fix warning during test
mdboom Jan 4, 2016
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
15 changes: 8 additions & 7 deletions lib/matplotlib/style/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@
'savefig.directory', 'tk.window_focus', 'hardcopy.docstring'])


def _remove_blacklisted_style_params(d):
def _remove_blacklisted_style_params(d, warn=True):
o = {}
for key, val in d.items():
if key in STYLE_BLACKLIST:
warnings.warn(
"Style includes a parameter, '{0}', that is not related to "
"style. Ignoring".format(key))
if warn:
warnings.warn(
"Style includes a parameter, '{0}', that is not related "
"to style. Ignoring".format(key))
else:
o[key] = val
return o
Expand All @@ -60,8 +61,8 @@ def is_style_file(filename):
return STYLE_FILE_PATTERN.match(filename) is not None


def _apply_style(d):
mpl.rcParams.update(_remove_blacklisted_style_params(d))
def _apply_style(d, warn=True):
mpl.rcParams.update(_remove_blacklisted_style_params(d, warn=warn))


def use(style):
Expand Down Expand Up @@ -98,7 +99,7 @@ def use(style):
if not cbook.is_string_like(style):
_apply_style(style)
elif style == 'default':
_apply_style(rcParamsDefault)
_apply_style(rcParamsDefault, warn=False)
elif style in library:
_apply_style(library[style])
else:
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/tests/test_backend_qt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from matplotlib.testing.decorators import cleanup, switch_backend
from matplotlib.testing.decorators import knownfailureif
from matplotlib._pylab_helpers import Gcf
import matplotlib.style as mstyle
import matplotlib
import copy

try:
Expand All @@ -17,7 +17,7 @@
import mock

try:
with mstyle.context({'backend': 'Qt4Agg'}):
with matplotlib.rc_context(rc={'backend': 'Qt4Agg'}):
from matplotlib.backends.qt_compat import QtCore

from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/tests/test_backend_qt5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from matplotlib.testing.decorators import cleanup, switch_backend
from matplotlib.testing.decorators import knownfailureif
from matplotlib._pylab_helpers import Gcf
import matplotlib.style as mstyle
import matplotlib
import copy

try:
Expand All @@ -16,7 +16,7 @@
import mock

try:
with mstyle.context({'backend': 'Qt5Agg'}):
with matplotlib.rc_context(rc={'backend': 'Qt5Agg'}):
from matplotlib.backends.qt_compat import QtCore, __version__
from matplotlib.backends.backend_qt5 import (MODIFIER_KEYS,
SUPER, ALT, CTRL, SHIFT)
Expand Down