Merge pull request #4359 from takluyver/i4335

test_pylabtools also needs to modify matplotlib.rcParamsOrig

IPython/core/tests/test_pylabtools.py

@@ -73,7 +73,9 b' class TestPylabSwitch(object):'
 
         # Save rcParams since they get modified
         self._saved_rcParams = matplotlib.rcParams
+        self._saved_rcParamsOrig = matplotlib.rcParamsOrig
         matplotlib.rcParams = dict(backend='Qt4Agg')
+        matplotlib.rcParamsOrig = dict(backend='Qt4Agg')
 
         # Mock out functions
         self._save_am = pt.activate_matplotlib
@@ -89,6 +91,7 b' class TestPylabSwitch(object):'
         pt.configure_inline_support = self._save_cis
         import matplotlib
         matplotlib.rcParams = self._saved_rcParams
+        matplotlib.rcParamsOrig = self._saved_rcParamsOrig
 
     def test_qt(self):
         s = self.Shell()