BUG : make rcParams.update validates inputs

tacaswell · tacaswell · commit ec7276c1c1ae · 2014-09-24T23:37:54.000-04:00
Close #3470 Over-ride `update` so that inputs are validated.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -821,7 +821,7 @@ class RcParams(dict):
     def __setitem__(self, key, val):
         try:
             if key in _deprecated_map:
-                alt_key, alt_val  = _deprecated_map[key]
+                alt_key, alt_val = _deprecated_map[key]
                 warnings.warn(self.msg_depr % (key, alt_key))
                 key = alt_key
                 val = alt_val(val)
@@ -840,7 +840,7 @@ def __setitem__(self, key, val):
 
     def __getitem__(self, key):
         if key in _deprecated_map:
-            alt_key, alt_val  = _deprecated_map[key]
+            alt_key, alt_val = _deprecated_map[key]
             warnings.warn(self.msg_depr % (key, alt_key))
             key = alt_key
         elif key in _deprecated_ignore_map:
@@ -849,6 +849,16 @@ def __getitem__(self, key):
             key = alt
         return dict.__getitem__(self, key)
 
+    # http://stackoverflow.com/questions/2390827/how-to-properly-subclass-dict-and-override-get-set
+    # the default dict `update` does not use __setitem__
+    # so rcParams.update(...) (such as in seaborn) side-steps
+    # all of the validation over-ride update to force
+    # through __setitem__
+    def update(self, *args, **kwargs):
+
+        for k, v in six.iteritems(dict(*args, **kwargs)):
+            self[k] = v
+
     def __repr__(self):
         import pprint
         class_name = self.__class__.__name__
