Commitbdaaf59

committed

MNT: raise exception if generators passed in

- moved next(iter(obj)) logic into a cbook function

1 parent1ba3a51 commitbdaaf59Copy full SHA for bdaaf59

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2331,11 +2331,11 @@ def broken_barh(self, xranges, yrange, **kwargs):`
`2331`	`2331`	`"""`
`2332`	`2332`	`# process the unit information`
`2333`	`2333`	`iflen(xranges):`
`2334`		`-xdata=next(iter(xranges))`
	`2334`	`+xdata=cbook.safe_first_element(xranges)`
`2335`	`2335`	`else:`
`2336`	`2336`	`xdata=None`
`2337`	`2337`	`iflen(yrange):`
`2338`		`-ydata=next(iter(yrange))`
	`2338`	`+ydata=cbook.safe_first_element(yrange)`
`2339`	`2339`	`else:`
`2340`	`2340`	`ydata=None`
`2341`	`2341`	`self._process_unit_info(xdata=xdata,`
`@@ -5886,7 +5886,8 @@ def _normalize_input(inp, ename='input'):`
`5886`	`5886`	Name to use in ValueError if `inp` can not be normalized
`5887`	`5887`
`5888`	`5888`	`"""`
`5889`		`-ifisinstance(x,np.ndarray)ornotiterable(next(iter(inp))):`
	`5889`	`+if (isinstance(x,np.ndarray)or`
	`5890`	`+notiterable(cbook.safe_first_element(inp))):`
`5890`	`5891`	`# TODO: support masked arrays;`
`5891`	`5892`	`inp=np.asarray(inp)`
`5892`	`5893`	`ifinp.ndim==2:`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`frommatplotlib.externalsimportsix`
`13`	`13`	`frommatplotlib.externals.six.movesimportxrange,zip`
`14`	`14`	`fromitertoolsimportrepeat`
	`15`	`+importcollections`
`15`	`16`
`16`	`17`	`importdatetime`
`17`	`18`	`importerrno`
`@@ -2536,6 +2537,13 @@ def index_of(y):`
`2536`	`2537`	`returnnp.arange(y.shape[0],dtype=float),y`
`2537`	`2538`
`2538`	`2539`
	`2540`	`+defsafe_first_element(obj):`
	`2541`	`+ifisinstance(obj,collections.Iterator):`
	`2542`	`+raiseRuntimeError("matplotlib does not support generators "`
	`2543`	`+"as input")`
	`2544`	`+returnnext(iter(obj))`
	`2545`	`+`
	`2546`	`+`
`2539`	`2547`	`defget_label(y,default_name):`
`2540`	`2548`	`try:`
`2541`	`2549`	`returny.name`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1561,7 +1561,7 @@ def default_units(x, axis):`
`1561`	`1561`	`x=x.ravel()`
`1562`	`1562`
`1563`	`1563`	`try:`
`1564`		`-x=next(iter(x))`
	`1564`	`+x=cbook.safe_first_element(x)`
`1565`	`1565`	`except (TypeError,StopIteration):`
`1566`	`1566`	`pass`
`1567`	`1567`

Comments

(0)