8000 BUG: Errors thrown by 0d arrays in setitem are silenced and replaced by eric-wieser · Pull Request #9752 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Errors thrown by 0d arrays in setitem are silenced and replaced #9752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2017
Merged

BUG: Errors thrown by 0d arrays in setitem are silenced and replaced #9752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions numpy/core/src/multiarray/arraytypes.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@
#include <limits.h>
#include <assert.h>

/* check for sequences, but ignore the types numpy considers scalars */
static NPY_INLINE npy_bool
PySequence_NoString_Check(PyObject *op) {
return
PySequence_Check(op) &&
!PyString_Check(op) &&
!PyUnicode_Check(op) &&
!PyArray_IsZeroDim(op);
}

/*
*****************************************************************************
** PYTHON TYPES TO C TYPES **
Expand Down Expand Up @@ -223,8 +233,7 @@ static int
if (PyErr_Occurred()) {
PyObject *type, *value, *traceback;
PyErr_Fetch(&type, &value, &traceback);
if (PySequence_Check(op) && !PyString_Check(op) &&
!PyUnicode_Check(op)) {
if (PySequence_NoString_Check(op)) {
PyErr_SetString(PyExc_ValueError,
"setting an array element with a sequence.");
Py_DECREF(type);
Expand Down Expand Up @@ -461,7 +470,7 @@ UNICODE_setitem(PyObject *op, void *ov, void *vap)
return convert_to_scalar_and_retry(op, ov, vap, UNICODE_setitem);
}

if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op)) {
if (PySequence_NoString_Check(op)) {
PyErr_SetString(PyExc_ValueError,
"setting an array element with a sequence");
return -1;
Expand Down Expand Up @@ -552,7 +561,7 @@ STRING_setitem(PyObject *op, void *ov, void *vap)
return convert_to_scalar_and_retry(op, ov, vap, STRING_setitem);
}

if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op)) {
if (PySequence_NoString_Check(op)) {
PyErr_SetString(PyExc_ValueError,
"setting an array element with a sequence");
return -1;
Expand Down
25 changes: 24 additions & 1 deletion numpy/ma/tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

__author__ = "Pierre GF Gerard-Marchant"

import sys
import warnings
import pickle
import operator
Expand All @@ -20,7 +21,7 @@
import numpy.core.fromnumeric as fromnumeric
import numpy.core.umath as umath
from numpy.testing import (
run_module_suite, assert_raises, assert_warns, suppress_warnings
run_module_suite, assert_raises, assert_warns, suppress_warnings, dec
)
from numpy import ndarray
from numpy.compat import asbytes, asbytes_nested
Expand Down Expand Up @@ -4836,6 +4837,28 @@ def test_immutable(self):
assert_raises(ValueError, operator.setitem, view.data, (), 1)
assert_raises(ValueError, operator.setitem, view.mask, (), False)

@dec.knownfailureif(sys.version_info.major == 2, "See gh-9751")
def test_coercion_int(self):
a_i = np.zeros((), int)
assert_raises(MaskError, operator.setitem, a_i, (), np.ma.masked)

def test_coercion_float(self):
a_f = np.zeros((), float)
assert_warns(UserWarning, operator.setitem, a_f, (), np.ma.masked)
assert_(np.isnan(a_f[()]))

@dec.knownfailureif(True, "See gh-9750")
def test_coercion_unicode(self):
a_u = np.zeros((), 'U10')
a_u[()] = np.ma.masked
assert_equal(a_u[()], u'--')

@dec.knownfailureif(True, "See gh-9750")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#9750 and #9751 are not new bugs from this patch - they're in 1.13 too

def test_coercion_bytes(self):
a_b = np.zeros((), 'S10')
a_b[()] = np.ma.masked
assert_equal(a_b[()], b'--')


def test_masked_array():
a = np.ma.array([0, 1, 2, 3], mask=[0, 0, 1, 0])
Expand Down
0