summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorHunter Damron <hdamron1594@yahoo.com>2019-05-08 12:35:20 -0400
committerHunter Damron <hdamron1594@yahoo.com>2019-05-08 14:29:31 -0400
commitc9407cc12d39cd12a28db4a1272ee4554e07326c (patch)
tree98226a96874ee7f5a1a98e0f47abad612168ea45 /numpy
parent5611663f8e4e41e46fd52daf63a78317ee238581 (diff)
downloadnumpy-c9407cc12d39cd12a28db4a1272ee4554e07326c.tar.gz
BUG: Removes ValueError for empty kwargs in arraymultiter_new
closes gh-13455
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/iterators.c2
-rw-r--r--numpy/core/tests/test_numeric.py12
2 files changed, 13 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index 9fcdc91b2..73c15b099 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -1388,7 +1388,7 @@ arraymultiter_new(PyTypeObject *NPY_UNUSED(subtype), PyObject *args, PyObject *k
PyArrayMultiIterObject *multi;
PyObject *arr;
- if (kwds != NULL) {
+ if (kwds != NULL && PyDict_Size(kwds) > 0) {
PyErr_SetString(PyExc_ValueError,
"keyword arguments not accepted.");
return NULL;
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index 1c53f9372..406110fa7 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -2766,6 +2766,18 @@ class TestBroadcast(object):
mit = np.broadcast(*arrs)
assert_equal(mit.numiter, j)
+ def test_broadcast_error_kwargs(self):
+ #gh-13455
+ arrs = [np.empty((5, 6, 7))]
+ mit = np.broadcast(*arrs)
+ mit2 = np.broadcast(*arrs, **{})
+ assert_equal(mit.shape, mit2.shape)
+ assert_equal(mit.ndim, mit2.ndim)
+ assert_equal(mit.nd, mit2.nd)
+ assert_equal(mit.numiter, mit2.numiter)
+ assert_(mit.iters[0].base is mit2.iters[0].base)
+
+ assert_raises(ValueError, np.broadcast, 1, **{'x': 1})
class TestKeepdims(object):