Update exception string to use %r for formatting

samsontmr · samsontmr · commit e702cd83592b · 2017-01-16T16:36:48.000+08:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4777,8 +4777,8 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
 
         for name, array in [('x', x), ('y1', y1), ('y2', y2)]:
             if array.ndim > 1:
-                raise ValueError('Input passed into argument "' + name +
-                                 '" is not 1-dimensional.')
+                raise ValueError('Input passed into argument "%r"' % name +
+                                 'is not 1-dimensional.')
 
         if y1.ndim == 0:
             y1 = np.ones_like(x) * y1
@@ -4941,10 +4941,10 @@ def fill_betweenx(self, y, x1, x2=0, where=None,
         x1 = ma.masked_invalid(self.convert_xunits(x1))
         x2 = ma.masked_invalid(self.convert_xunits(x2))
 
-        for array in [('x', x), ('y1', y1), ('y2', y2)]:
-            if array[1].ndim > 1:
-                raise ValueError('Input passed into argument "' + array[0] +
-                                 '" is not 1-dimensional.')
+        for name, array in [('y', y), ('x1', x1), ('x2', x2)]:
+            if array.ndim > 1:
+                raise ValueError('Input passed into argument "%r"' % name +
+                                 'is not 1-dimensional.')
 
         if x1.ndim == 0:
             x1 = np.ones_like(y) * x1
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -725,39 +725,42 @@ def test_polycollection_joinstyle():
     ax.set_ybound(0, 3)
 
 
+@cleanup
 def test_fill_between_2d_x_input():
     x = np.zeros((2, 2))
     y1 = 3
     y2 = 3
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(x, y1, x, y2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(x, y1, x, y2, color='black')
         ax.fill_between(x, y1, y2)
 
 
+@cleanup
 def test_fill_between_2d_y1_input():
     x = np.arange(0.0, 2, 0.02)
     y1 = np.zeros((2, 2))
     y2 = 3
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(x, y1, x, y2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(x, y1, x, y2, color='black')
         ax.fill_between(x, y1, y2)
 
 
+@cleanup
 def test_fill_between_2d_y2_input():
     x = np.arange(0.0, 2, 0.02)
     y1 = 3
     y2 = np.zeros((2, 2))
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(x, y1, x, y2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(x, y1, x, y2, color='black')
         ax.fill_between(x, y1, y2)
 
 
@@ -4837,39 +4840,42 @@ def test_tick_param_label_rotation():
         assert text.get_rotation() == 90
 
 
+@cleanup
 def test_fill_betweenx_2d_y_input():
     y = np.zeros((2, 2))
     x1 = 3
     x2 = 3
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(y, x1, y, x2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(y, x1, y, x2, color='black')
         ax.fill_betweenx(y, x1, x2)
 
 
+@cleanup
 def test_fill_betweenx_2d_x1_input():
     y = np.arange(0.0, 2, 0.02)
     x1 = np.zeros((2, 2))
     x2 = 3
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(y, x1, y, x2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(y, x1, y, x2, color='black')
         ax.fill_betweenx(y, x1, x2)
 
 
+@cleanup
 def test_fill_betweenx_2d_x2_input():
     y = np.arange(0.0, 2, 0.02)
     x1 = 3
     x2 = np.zeros((2, 2))
 
     fig = plt.figure()
     ax = fig.add_subplot(211)
-    ax.plot(y, x1, y, x2, color='black')
     with pytest.raises(ValueError):
+        ax.plot(y, x1, y, x2, color='black')
         ax.fill_betweenx(y, x1, x2)
 
 
