diff options
| author | 87 <hangenuit@gmail.com> | 2011-10-25 00:59:58 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2013-04-11 16:55:41 +0200 |
| commit | 2fc6673edce84bf5d7dd745964ba9dab2144d03b (patch) | |
| tree | e5c295cb72bfbda9c26dde62a28ccef2d855289e | |
| parent | e813dae46054e7ef5ba4fe8a6db4597a202c3afb (diff) | |
| download | numpy-2fc6673edce84bf5d7dd745964ba9dab2144d03b.tar.gz | |
BUG: Tuple conversion may not propagate errors from int conversion.
Conflicts:
numpy/core/src/multiarray/mapping.c
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index 1e3c06b73..504f24d24 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -962,6 +962,7 @@ _tuple_of_integers(PyObject *seq, npy_intp *vals, int maxvals) } temp = PyArray_PyIntAsIntp(obj); if (error_converting(temp)) { + PyErr_Clear(); return 0; } if (!PyIndex_Check_Or_Unsupported(obj)) { |