Changed assertions to pytest.raises matches.

Author: turnipseason

lib/matplotlib/tests/test_axes.py

@@ -642,28 +642,25 @@ def test_sticky_shared_axes(fig_test, fig_ref):
 
 
 def test_nargs_stem():
-    with pytest.raises(TypeError) as e:
+    with pytest.raises(TypeError, match='0 were given') as e:
         # stem() takes 1-3 arguments.
         plt.stem()
-    assert "stem() takes 1-3" in str(e.value)
 
 
 def test_nargs_legend():
-    with pytest.raises(TypeError) as e:
+    with pytest.raises(TypeError, match='3 were given') as e:
         ax = plt.subplot()
         # legend() takes 0-2 arguments.
         ax.legend(['First'], ['Second'], 3)
-    assert "legend() takes 0-2" in str(e.value)
 
 
 def test_nargs_pcolorfast():
-    with pytest.raises(TypeError) as e:
+    with pytest.raises(TypeError, match='2 were given') as e:
         ax = plt.subplot()
         # pcolorfast() takes 1 or 3 arguments,
         # not passing any arguments fails at C = args[-1]
         # before nargs_err is raised.
         ax.pcolorfast([(0, 1), (0, 2)], [[1, 2, 3], [1, 2, 3]])
-    assert "pcolorfast() takes 1 or 3" in str(e.value)
 
 
 @image_comparison(['offset_points'], remove_text=True)

lib/matplotlib/tests/test_rcparams.py

@@ -120,10 +120,9 @@ def test_rcparams_init():
 
 def test_nargs_cycler():
     from matplotlib.rcsetup import cycler as ccl
-    with pytest.raises(TypeError) as e:
+    with pytest.raises(TypeError, match='3 were given') as e:
         # cycler() takes 0-2 arguments.
         ccl(ccl(color=list('rgb')), 2, 3)
-    assert "cycler() takes 0-2" in str(e.value)
 
 
 def test_Bug_2543():