diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2008-03-05 06:20:04 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2008-03-05 06:20:04 +0000 |
| commit | a783bfde54692d7c192c5e90c8d9def5af47d552 (patch) | |
| tree | 6194e3474190523ac42b9f87cb5068eb631f26a2 /numpy/core/src | |
| parent | 4b3dd3d8e020cac32779caeebd6848989bfeed53 (diff) | |
| download | numpy-a783bfde54692d7c192c5e90c8d9def5af47d552.tar.gz | |
Fix ticket 597.
The conversion of negative numbers to uint64 returned the wrong values.
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/arraytypes.inc.src | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src index fd43b4c58..210a2230e 100644 --- a/numpy/core/src/arraytypes.inc.src +++ b/numpy/core/src/arraytypes.inc.src @@ -52,12 +52,12 @@ MyPyLong_AsUnsignedLongLong(PyObject *vv) ret = PyLong_AsUnsignedLongLong(vv); if (PyErr_Occurred()) { - longlong new; PyErr_Clear(); - new = PyLong_AsLongLong(vv); + longlong new = PyLong_AsLongLong(vv); if (!PyErr_Occurred() && new < 0) ret = (ulonglong) new; - ret = NPY_MAX_ULONGLONG; + else + ret = NPY_MAX_ULONGLONG; } Py_DECREF(vv); return ret; |