Commit 29ce2c2

committed

FIX: fix check_1d to also check for ndim

Arrays sometimes don't have all the methods arrays should have, so add another check here. Plot requires both ndim and shape and this will extract the numpy array if x does not have those attributes. Otherwise leave the object alone, because unit support (currently only in plot) requires the object to retain the unit info.

1 parent f8cd2c9 commit 29ce2c2Copy full SHA for 29ce2c2

File tree

2 files changed

+25

-1

lines changed

lib/matplotlib
- cbook
  - __init__.py
- tests
  - test_units.py

2 files changed

+25

-1

lines changed

`‎lib/matplotlib/cbook/init.py‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,12 @@ def _check_1d(x):`
`1333`	`1333`	`"""Convert scalars to 1D arrays; pass-through arrays as is."""`
`1334`	`1334`	`# Unpack in case of e.g. Pandas or xarray object`
`1335`	`1335`	`x = _unpack_to_numpy(x)`
`1336`		`- if not hasattr(x, 'shape') or len(x.shape) < 1:`
	`1336`	+ # plot requires `shape` and `ndim`. If passed an
	`1337`	`+ # object that doesn't provide them, then force to numpy array.`
	`1338`	`+ # Note this will strip unit information.`
	`1339`	`+ if (not hasattr(x, 'shape') or`
	`1340`	`+ not hasattr(x, 'ndim') or`
	`1341`	`+ len(x.shape) < 1):`
`1337`	`1342`	`return np.atleast_1d(x)`
`1338`	`1343`	`else:`
`1339`	`1344`	`return x`

`‎lib/matplotlib/tests/test_units.py‎`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -264,3 +264,22 @@ def test_empty_default_limits(quantity_converter):`
`264`	`264`	`fig.draw_without_rendering()`
`265`	`265`	`assert ax.get_ylim() == (0, 100)`
`266`	`266`	`assert ax.get_xlim() == (28.5, 31.5)`
	`267`	`+`
	`268`	`+`
	`269`	`+# test array-like objects...`
	`270`	`+class Kernel:`
	`271`	`+ def __init__(self, array):`
	`272`	`+ self._array = np.asanyarray(array)`
	`273`	`+`
	`274`	`+ def __array__(self):`
	`275`	`+ return self._array`
	`276`	`+`
	`277`	`+ @property`
	`278`	`+ def shape(self):`
	`279`	`+ return self._array.shape`
	`280`	`+`
	`281`	`+`
	`282`	`+def test_plot_kernel():`
	`283`	`+ # just a smoketest that fail`
	`284`	`+ kernel = Kernel([1, 2, 3, 4, 5])`
	`285`	`+ plt.plot(kernel)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 29ce2c2

File tree

2 files changed

2 files changed

`‎lib/matplotlib/cbook/init.py‎`

`‎lib/matplotlib/tests/test_units.py‎`

0 commit comments

Uh oh!

File tree

2 files changed

2 files changed

‎lib/matplotlib/cbook/__init__.py‎

‎lib/matplotlib/tests/test_units.py‎

0 commit comments

`‎lib/matplotlib/cbook/init.py‎`

`‎lib/matplotlib/tests/test_units.py‎`