diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2020-05-01 20:23:40 +0200 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2020-05-01 20:23:40 +0200 |
| commit | 1f5a610b7838d92daeea6f2edc0b58e80d74c76a (patch) | |
| tree | 62abe833872b2595d1946c808e8d16c6448b6f92 | |
| parent | f9dbd6a26a286bb05100f8151ec6307af750f580 (diff) | |
| download | cython-1f5a610b7838d92daeea6f2edc0b58e80d74c76a.tar.gz | |
Change an exception return value to avoid an "umbiguous exception value" warning by Cython itself.
| -rw-r--r-- | Cython/Compiler/ExprNodes.py | 4 | ||||
| -rw-r--r-- | Cython/Utility/MemoryView.pyx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py index cf2c820f4..ce1fe2870 100644 --- a/Cython/Compiler/ExprNodes.py +++ b/Cython/Compiler/ExprNodes.py @@ -7250,8 +7250,8 @@ class AttributeNode(ExprNode): code.put_incref_memoryviewslice(self.result(), self.type, have_gil=True) - T = "__pyx_memslice_transpose(&%s) == 0" - code.putln(code.error_goto_if(T % self.result(), self.pos)) + T = "__pyx_memslice_transpose(&%s)" % self.result() + code.putln(code.error_goto_if_neg(T, self.pos)) elif self.initialized_check: code.putln( 'if (unlikely(!%s.memview)) {' diff --git a/Cython/Utility/MemoryView.pyx b/Cython/Utility/MemoryView.pyx index 6dc38405d..bfefeb2ec 100644 --- a/Cython/Utility/MemoryView.pyx +++ b/Cython/Utility/MemoryView.pyx @@ -940,7 +940,7 @@ cdef char *pybuffer_index(Py_buffer *view, char *bufp, Py_ssize_t index, ### Transposing a memoryviewslice # @cname('__pyx_memslice_transpose') -cdef int transpose_memslice({{memviewslice_name}} *memslice) nogil except 0: +cdef int transpose_memslice({{memviewslice_name}} *memslice) nogil except -1: cdef int ndim = memslice.memview.view.ndim cdef Py_ssize_t *shape = memslice.shape @@ -956,7 +956,7 @@ cdef int transpose_memslice({{memviewslice_name}} *memslice) nogil except 0: if memslice.suboffsets[i] >= 0 or memslice.suboffsets[j] >= 0: _err(PyExc_ValueError, "Cannot transpose memoryview with indirect dimensions") - return 1 + return 0 # ### Creating new memoryview objects from slices and memoryviews |