Skip to content

Commit b74145f

Browse files
committed
Merge pull request matplotlib#3719 from jenshnielsen/rcparam_warn_error
ENH : Turn rcparams warning into error and remove knowfail
2 parents bf29166 + 852a831 commit b74145f

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

lib/matplotlib/__init__.py

+2-24
Original file line numberDiff line numberDiff line change
@@ -834,14 +834,6 @@ def matplotlib_fname():
834834
_all_deprecated = set(chain(_deprecated_ignore_map,
835835
_deprecated_map, _obsolete_set))
836836

837-
_rcparam_warn_str = ("Trying to set {key} to {value} via the {func} "
838-
"method of RcParams which does not validate cleanly. "
839-
"This warning will turn into an Exception in 1.5. "
840-
"If you think {value} should validate correctly for "
841-
"rcParams[{key}] "
842-
"please create an issue on github."
843-
)
844-
845837

846838
class RcParams(dict):
847839

@@ -861,14 +853,7 @@ class RcParams(dict):
861853
# validate values on the way in
862854
def __init__(self, *args, **kwargs):
863855
for k, v in six.iteritems(dict(*args, **kwargs)):
864-
try:
865-
self[k] = v
866-
except (ValueError, RuntimeError):
867-
# force the issue
868-
warnings.warn(_rcparam_warn_str.format(key=repr(k),
869-
value=repr(v),
870-
func='__init__'))
871-
dict.__setitem__(self, k, v)
856+
self[k] = v
872857

873858
def __setitem__(self, key, val):
874859
try:
@@ -908,14 +893,7 @@ def __getitem__(self, key):
908893
# through __setitem__
909894
def update(self, *args, **kwargs):
910895
for k, v in six.iteritems(dict(*args, **kwargs)):
911-
try:
912-
self[k] = v
913-
except (ValueError, RuntimeError):
914-
# force the issue
915-
warnings.warn(_rcparam_warn_str.format(key=repr(k),
916-
value=repr(v),
917-
func='update'))
918-
dict.__setitem__(self, k, v)
896+
self[k] = v
919897

920898
def __repr__(self):
921899
import pprint

lib/matplotlib/tests/test_rcparams.py

-4
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ def test_RcParams_class():
105105
assert ['font.family'] == list(six.iterkeys(rc.find_all('family')))
106106

107107

108-
# remove know failure + warnings after merging to master
109-
@knownfailureif(not (sys.version_info[:2] < (2, 7)))
110108
def test_rcparams_update():
111109
if sys.version_info[:2] < (2, 7):
112110
raise nose.SkipTest("assert_raises as context manager "
@@ -123,8 +121,6 @@ def test_rcparams_update():
123121
rc.update(bad_dict)
124122

125123

126-
# remove know failure + warnings after merging to master
127-
@knownfailureif(not (sys.version_info[:2] < (2, 7)))
128124
def test_rcparams_init():
129125
if sys.version_info[:2] < (2, 7):
130126
raise nose.SkipTest("assert_raises as context manager "

0 commit comments

Comments
 (0)