diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2018-01-18 01:21:03 -0800 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2018-01-18 01:41:24 -0800 |
| commit | 47c4f32b9a51f549041cd71ddaad3055c7752d5e (patch) | |
| tree | ed831e62fa7a70c05a366aaa15c28e0d9878821f | |
| parent | 669e87af8f2fdda9f17ad221a0e8cc1fd91c5a0e (diff) | |
| download | numpy-47c4f32b9a51f549041cd71ddaad3055c7752d5e.tar.gz | |
MAINT: Use ValueError for duplicate field names in lookup
KeyError suggests the field name does not exist, which is inaccurate.
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index 22186b639..060384a83 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -1513,7 +1513,7 @@ _get_field_view(PyArrayObject *arr, PyObject *ind, PyArrayObject **view) PyObject *errmsg = PyUString_FromString( "duplicate field of name "); PyUString_ConcatAndDel(&errmsg, name); - PyErr_SetObject(PyExc_KeyError, errmsg); + PyErr_SetObject(PyExc_ValueError, errmsg); Py_DECREF(errmsg); Py_DECREF(fields); Py_DECREF(names); diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index e54d67a0d..1113b6476 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -1157,9 +1157,11 @@ class TestStructured(object): def test_multiindex_titles(self): a = np.zeros(4, dtype=[(('a', 'b'), 'i'), ('c', 'i'), ('d', 'i')]) assert_raises(KeyError, lambda : a[['a','c']]) - assert_raises(KeyError, lambda : a[['b','b']]) + assert_raises(KeyError, lambda : a[['a','a']]) + assert_raises(ValueError, lambda : a[['b','b']]) # field exists, but repeated a[['b','c']] # no exception + class TestBool(object): def test_test_interning(self): a0 = np.bool_(0) |