Commite5c48d6

committed

Change hist empty check to not use 2D arrays.

This causes a NumPy deprecation warning if the list is ragged.

1 parente842b17 commite5c48d6Copy full SHA for e5c48d6

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6558,8 +6558,6 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,`
`6558`	`6558`	`# Massage 'x' for processing.`
`6559`	`6559`	`x=cbook._reshape_2D(x,'x')`
`6560`	`6560`	`nx=len(x)# number of datasets`
`6561`		`-# basic input validation`
`6562`		`-input_empty=np.size(x)==0`
`6563`	`6561`
`6564`	`6562`	`# Process unit information`
`6565`	`6563`	`# Unit conversion is done individually on each dataset`
`@@ -6581,9 +6579,13 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,`
`6581`	`6579`	`iflen(w)!=nx:`
`6582`	`6580`	`raiseValueError('weights should have the same shape as x')`
`6583`	`6581`
	`6582`	`+input_empty=True`
`6584`	`6583`	`forxi,wiinzip(x,w):`
`6585`		`-ifwiisnotNoneandlen(wi)!=len(xi):`
	`6584`	`+lxi=len(xi)`
	`6585`	`+ifwiisnotNoneandlen(wi)!=lxi:`
`6586`	`6586`	`raiseValueError('weights should have the same shape as x')`
	`6587`	`+iflxi:`
	`6588`	`+input_empty=False`
`6587`	`6589`
`6588`	`6590`	`ifcolorisNone:`
`6589`	`6591`	`color= [self._get_lines.get_next_color()foriinrange(nx)]`

Comments

(0)