Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

Conflicts: lib/matplotlib/tests/baseline_images/test_path/xkcd.pdf lib/matplotlib/tests/baseline_images/test_path/xkcd.png lib/matplotlib/tests/baseline_images/test_path/xkcd.svg images from master branch used lib/matplotlib/tests/test_axes.py kept both tests
matplotlib · Dec 29, 2015 · dcf50b3 · dcf50b3
2 parents 144aa6b + 781000c
commit dcf50b3
Show file tree

Hide file tree

Showing 6 changed files with 12,039 additions and 11,987 deletions.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2336,8 +2336,16 @@ def broken_barh(self, xranges, yrange, **kwargs):
         .. plot:: mpl_examples/pylab_examples/broken_barh.py
         """
         # process the unit information
-        self._process_unit_info(xdata=xranges[0],
-                                ydata=yrange[0],
+        if len(xranges):
+            xdata = six.next(iter(xranges))
+        else:
+            xdata = None
+        if len(yrange):
+            ydata = six.next(iter(yrange))
+        else:
+            ydata = None
+        self._process_unit_info(xdata=xdata,
+                                ydata=ydata,
                                 kwargs=kwargs)
         xranges = self.convert_xunits(xranges)
         yrange = self.convert_yunits(yrange)

diff --git a/lib/matplotlib/tests/baseline_images/test_path/xkcd.pdf b/lib/matplotlib/tests/baseline_images/test_path/xkcd.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_path/xkcd.png b/lib/matplotlib/tests/baseline_images/test_path/xkcd.png