diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-01-16 04:51:57 +1100 |
---|---|---|
committer | Eric Wieser <wieser.eric@gmail.com> | 2020-01-15 17:51:57 +0000 |
commit | 87c04cb35aa7eda9372a61cf65939f13d32fa141 (patch) | |
tree | 980038d01651ccdc61f0cd90e5b7f1ac41f74994 /numpy/polynomial/polyutils.py | |
parent | a5e5e51187d4476841503ce816924ea99936dba0 (diff) | |
download | numpy-87c04cb35aa7eda9372a61cf65939f13d32fa141.tar.gz |
MAINT: Ragged cleanup (#15085)
* TST: refactor sorter tests, use proper ragged array creation syntax
* MAINT: code never hit the exception, but would error when iterating
* MAINT: pytest.mark.parametrize did not add much, removing (from review)
* MAINT: use asanyarray and generalize (from review)
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Diffstat (limited to 'numpy/polynomial/polyutils.py')
-rw-r--r-- | numpy/polynomial/polyutils.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/numpy/polynomial/polyutils.py b/numpy/polynomial/polyutils.py index b65e88a83..9b8e9fc42 100644 --- a/numpy/polynomial/polyutils.py +++ b/numpy/polynomial/polyutils.py @@ -540,17 +540,15 @@ def _valnd(val_f, c, *args): c, args : See the ``<type>val<n>d`` functions for more detail """ - try: - args = tuple(np.array(args, copy=False)) - except Exception: - # preserve the old error message - if len(args) == 2: + args = [np.asanyarray(a) for a in args] + shape0 = args[0].shape + if not all((a.shape == shape0 for a in args[1:])): + if len(args) == 3: raise ValueError('x, y, z are incompatible') - elif len(args) == 3: + elif len(args) == 2: raise ValueError('x, y are incompatible') else: raise ValueError('ordinates are incompatible') - it = iter(args) x0 = next(it) |