Fix #5572: Allow passing empty range to broken_barh #5600

mdboom · Dec 1, 2015

No description provided.

Probably safer to do xdata = next(iter(xrange)) in a try...except block. pandas Series slice on index rather than position

try:
    xdata = next(iter(xranges))
except (StopIteration, TypeError):
    xdata = None

plural typo, should be yrange

efiring · Dec 3, 2015

I dimly recall seeing this sort of pre-processing prior to _process_unit_info elsewhere; does it need to be factored out? E.g., could it be added to _process_unit_info itself, perhaps activated with a kwarg? Is there also a Pandas conversion stage that we are stuck having to use now, so that we don't end up sprinkling things like six.next(iter(xxx)) all over the place?

mdboom · Dec 22, 2015

This is now ready to merge.

I think we can just use next here https://docs.python.org/2/library/functions.html#next I think six provides it to support back to 2.4 or something like that.

tacaswell · Dec 28, 2015

backported as 8228dbd

mdboom added this to the Critical bugfix release (1.5.1) milestone Dec 1, 2015

mdboom added the needs_review label Dec 1, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

efiring Merge pull request #5600 from mdboom/empty-ranges
Fix #5572: Allow passing empty range to broken_barh
e7c51dc

efiring removed the needs_review label Dec 28, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

efiring + tacaswell Merge pull request #5600 from mdboom/empty-ranges
Fix #5572: Allow passing empty range to broken_barh
8228dbd

@@ -2333,8 +2333,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 = xranges[0]

@@ -2333,8 +2333,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(yranges))

mdboom	`Fix #5572: Allow passing empty range to broken_barh`		`f255c33`
mdboom	`Use iterator rather than index`	Some checks were not successful 1 failing, 1 pending, and 1 successful checks continuous-integration/travis-ci/pr — The Travis CI build failed Details coverage/coveralls — Coverage pending from Coveralls.io Details continuous-integration/appveyor/pr — AppVeyor build succeeded Details	`76d681b`
mdboom	`Fix typo`	All checks have passed 3 successful checks continuous-integration/appveyor/pr — AppVeyor build succeeded Details continuous-integration/travis-ci/pr — The Travis CI build passed Details coverage/coveralls — Coverage increased (+0.03%) to 68.344% Details	`115fca7`

@@ -2339,8 +2339,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))

matplotlib/matplotlib

Fix #5572: Allow passing empty range to broken_barh #5600

mdboom commented Dec 1, 2015

mdboom added this to the Critical bugfix release (1.5.1) milestone Dec 1, 2015

mdboom added the needs_review label Dec 1, 2015

tacaswell commented on an outdated diff Dec 1, 2015

tacaswell commented on an outdated diff Dec 3, 2015

efiring commented Dec 3, 2015

mdboom added some commits Dec 1, 2015

mdboom commented Dec 22, 2015

tacaswell commented on the diff Dec 22, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

efiring merged commit `e7c51dc` into matplotlib:master Dec 28, 2015
3 checks passed

3 checks passed

efiring removed the needs_review label Dec 28, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

tacaswell commented Dec 28, 2015

matplotlib/matplotlib

Join GitHub today

Fix #5572: Allow passing empty range to broken_barh #5600

Conversation

mdboom commented Dec 1, 2015

mdboom added this to the Critical bugfix release (1.5.1) milestone Dec 1, 2015

mdboom added the needs_review label Dec 1, 2015

Show 1 comment Hide comment tacaswell commented on an outdated diff Dec 1, 2015

tacaswell Dec 1, 2015

Show 1 comment Hide comment tacaswell commented on an outdated diff Dec 3, 2015

tacaswell Dec 3, 2015

efiring commented Dec 3, 2015

mdboom added some commits Dec 1, 2015

Some checks were not successful

All checks have passed

mdboom commented Dec 22, 2015

tacaswell commented on the diff Dec 22, 2015

tacaswell Dec 22, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

Hide details View details efiring merged commit e7c51dc into matplotlib:master Dec 28, 2015 3 checks passed

3 checks passed

efiring removed the needs_review label Dec 28, 2015

efiring added a commit that referenced this pull request Dec 28, 2015

tacaswell commented Dec 28, 2015

tacaswell commented on an outdated diff Dec 1, 2015

tacaswell commented on an outdated diff Dec 3, 2015

efiring merged commit `e7c51dc` into matplotlib:master Dec 28, 2015
3 checks passed