removed mentions of 'import nose'

matplotlib · pizzathief · Oct 31, 2015 · Nov 4, 2015 · Nov 4, 2015 · Nov 4, 2015
commit 0ba73236bce2068c371fc34d6acaca929576e24c
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -99,7 +99,7 @@ def get_file_results(self):
 #     """
 #
 #     if not HAS_PEP8:
-#         raise SkipTest('The pep8 tool is required for this test')
+#         raise pytest.skip('The pep8 tool is required for this test')
 #
 #     # to get a list of bad files, rather than the specific errors, add
 #     # "reporter=pep8.FileReport" to the StyleGuide constructor.

diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -172,15 +172,15 @@ def test_cycle_reset():
 @cleanup
 def test_invalid_input_forms():
     fig, ax = plt.subplots()
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle(1)
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle([1, 2])
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle('color', 'fish')
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle('linewidth', 1)
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle('linewidth', {'1': 1, '2': 2})
-    with pytest.raises((TypeError, ValueError)):
+    with pytest.raises(TypeError, ValueError):
         ax.set_prop_cycle(linewidth=1, color='r')
diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py
@@ -24,6 +24,8 @@ def fin():
         teardown_PsfontsMap()
     request.addfinalizer(fin)
 
+def teardown_PsfontsMap():
+    dr.find_tex_file = original_find_tex_file
 
 def test_PsfontsMap(setup_PsfontsMap):
     filename = os.path.join(

diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -15,9 +15,6 @@
 from matplotlib.tests import assert_str_equal
 from matplotlib.testing.decorators import cleanup
 import matplotlib.colors as mcolors
-# from nose.tools import assert_true, assert_raises, assert_equal
-# from nose.plugins.skip import SkipTest
-# import nose
 from itertools import chain
 import numpy as np
 from matplotlib.rcsetup import (validate_bool_maybe_none,