Change tests to use pytest.raises() instead of @raises

samsontmr · samsontmr · commit 72f6359c0596 · 2017-01-14T16:32:05.000+08:00
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -725,7 +725,6 @@ def test_polycollection_joinstyle():
     ax.set_ybound(0, 3)
 
 
-@raises(ValueError)
 def test_fill_between_2d_x_input():
     x = np.zeros((2, 2))
     y1 = 3
@@ -734,10 +733,10 @@ def test_fill_between_2d_x_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(x, y1, x, y2, color='black')
-    ax.fill_between(x, y1, y2)
+    with pytest.raises(ValueError):
+        ax.fill_between(x, y1, y2)
 
 
-@raises(ValueError)
 def test_fill_between_2d_y1_input():
     x = np.arange(0.0, 2, 0.02)
     y1 = np.zeros((2, 2))
@@ -746,10 +745,10 @@ def test_fill_between_2d_y1_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(x, y1, x, y2, color='black')
-    ax.fill_between(x, y1, y2)
+    with pytest.raises(ValueError):
+        ax.fill_between(x, y1, y2)
 
 
-@raises(ValueError)
 def test_fill_between_2d_y2_input():
     x = np.arange(0.0, 2, 0.02)
     y1 = 3
@@ -758,7 +757,8 @@ def test_fill_between_2d_y2_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(x, y1, x, y2, color='black')
-    ax.fill_between(x, y1, y2)
+    with pytest.raises(ValueError):
+        ax.fill_between(x, y1, y2)
 
 
 @image_comparison(baseline_images=['fill_between_interpolate'],
@@ -4837,7 +4837,6 @@ def test_tick_param_label_rotation():
         assert text.get_rotation() == 90
 
 
-@raises(ValueError)
 def test_fill_betweenx_2d_y_input():
     y = np.zeros((2, 2))
     x1 = 3
@@ -4846,10 +4845,10 @@ def test_fill_betweenx_2d_y_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(y, x1, y, x2, color='black')
-    ax.fill_betweenx(y, x1, x2)
+    with pytest.raises(ValueError):
+        ax.fill_betweenx(y, x1, x2)
 
 
-@raises(ValueError)
 def test_fill_betweenx_2d_x1_input():
     y = np.arange(0.0, 2, 0.02)
     x1 = np.zeros((2, 2))
@@ -4858,10 +4857,10 @@ def test_fill_betweenx_2d_x1_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(y, x1, y, x2, color='black')
-    ax.fill_betweenx(y, x1, x2)
+    with pytest.raises(ValueError):
+        ax.fill_betweenx(y, x1, x2)
 
 
-@raises(ValueError)
 def test_fill_betweenx_2d_x2_input():
     y = np.arange(0.0, 2, 0.02)
     x1 = 3
@@ -4870,7 +4869,8 @@ def test_fill_betweenx_2d_x2_input():
     fig = plt.figure()
     ax = fig.add_subplot(211)
     ax.plot(y, x1, y, x2, color='black')
-    ax.fill_betweenx(y, x1, x2)
+    with pytest.raises(ValueError):
+        ax.fill_betweenx(y, x1, x2)
 
 
 @cleanup(style='default')
