Updated tests to work with py3k

Vedant Nanda · Vedant Nanda · commit d660e49927cf · 2017-03-07T00:28:24.000+05:30
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4975,29 +4975,20 @@ def test_bar_single_height():
 
 
 def test_invalid_axes_limits():
-    error_string = 'NaN or Inf cannot be the argument values'
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.xlim(left=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.xlim(left=np.inf)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.xlim(right=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.xlim(right=np.inf)
-    assert err.value.message == error_string
 
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.ylim(bottom=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.ylim(bottom=np.inf)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.ylim(top=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         plt.ylim(top=np.inf)
-    assert err.value.message == error_string
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -494,44 +494,31 @@ def test_autoscale():
 
 
 def test_invalid_axes_limits():
-    error_string = 'NaN or Inf cannot be the argument values'
     fig = plt.figure()
     ax = fig.add_subplot(111, projection='3d')
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_xlim3d(left=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_xlim3d(left=np.inf)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_xlim3d(right=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_xlim3d(right=np.inf)
-    assert err.value.message == error_string
 
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_ylim3d(bottom=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_ylim3d(bottom=np.inf)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_ylim3d(top=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_ylim3d(top=np.inf)
-    assert err.value.message == error_string
 
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_zlim3d(bottom=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_zlim3d(bottom=np.inf)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_zlim3d(top=np.nan)
-    assert err.value.message == error_string
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError):
         ax.set_zlim3d(top=np.inf)
-    assert err.value.message == error_string
