Minor fixes

astrofrog · astrofrog · commit 8d3cd0c4b6e5 · 2014-11-02T17:03:48.000+01:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1256,6 +1256,7 @@ def __init__(self, rc=None, fname=None):
                 rcParams.update(self.rcdict)
         except:
             # if anything goes wrong, revert rc parameters and re-raise
+            rcParams.clear()
             rcParams.update(self._rcparams)
             raise
 
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -272,7 +272,7 @@ def test_rcparams_reset_after_fail():
 
     try:
         from collections import OrderedDict
-    except:
+    except ImportError:
         return  # can't run this test on Python 2.6
 
     with mpl.rc_context(rc={'text.usetex': False}):
