Add input validation for fill_between and fill_betweenx and unit tests

samsontmr · samsontmr · commit 506bd99eb5ac · 2017-01-13T15:47:35.000+08:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4757,6 +4757,13 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
                 for filling between two sets of x-values
 
         """
+
+        for input in [('x', x), ('y1', y1), ('y2', y2)]:
+            if not (cbook.is_scalar(input[1]) or
+                    cbook.is_scalar(cbook.safe_first_element(input[1]))):
+                raise ValueError('Input passed into argument "' + input[0] +
+                                 '" is not 1-dimensional.')
+
         if not rcParams['_internal.classic_mode']:
             color_aliases = mcoll._color_aliases
             kwargs = cbook.normalize_kwargs(kwargs, color_aliases)
@@ -4918,6 +4925,12 @@ def fill_betweenx(self, y, x1, x2=0, where=None,
                 for filling between two sets of y-values
 
         """
+
+        for input in [('y', y), ('x1', x1), ('x2', x2), ('where', where)]:
+            if not cbook.is_scalar(cbook.safe_first_element(input[1])):
+                raise ValueError('Input passed into argument "' + input[0] +
+                                 '" is not 1-dimensional.')
+
         if not rcParams['_internal.classic_mode']:
             color_aliases = mcoll._color_aliases
             kwargs = cbook.normalize_kwargs(kwargs, color_aliases)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -725,6 +725,42 @@ 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
+    y2 = 3
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(x, y1, x, y2, color='black')
+    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))
+    y2 = 3
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(x, y1, x, y2, color='black')
+    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
+    y2 = np.zeros((2, 2))
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(x, y1, x, y2, color='black')
+    ax.fill_between(x, y1, y2)
+
+
 @image_comparison(baseline_images=['fill_between_interpolate'],
                   remove_text=True)
 def test_fill_between_interpolate():
@@ -4801,6 +4837,42 @@ 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
+    x2 = 3
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(y, x1, y, x2, color='black')
+    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))
+    x2 = 3
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(y, x1, y, x2, color='black')
+    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
+    x2 = np.zeros((2, 2))
+
+    fig = plt.figure()
+    ax = fig.add_subplot(211)
+    ax.plot(y, x1, y, x2, color='black')
+    ax.fill_betweenx(y, x1, x2)
+
+
 @cleanup(style='default')
 def test_fillbetween_cycle():
     fig, ax = plt.subplots()
