[pypy-commit] pypy default: fix issue #2873 in micronumpy, thanks Andreas

mattip pypy.commits at gmail.com
Tue Aug 21 11:17:27 EDT 2018


Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r95013:73d842283378
Date: 2018-08-21 18:16 +0300
http://bitbucket.org/pypy/pypy/changeset/73d842283378/

Log:	fix issue #2873 in micronumpy, thanks Andreas

diff --git a/pypy/module/micronumpy/concrete.py b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -388,7 +388,7 @@
                 not self.flags & NPY.ARRAY_F_CONTIGUOUS):
            raise oefmt(errtype, "ndarray is not Fortran contiguous")
         if ((flags & space.BUF_ANY_CONTIGUOUS) == space.BUF_ANY_CONTIGUOUS and
-                not (self.flags & NPY.ARRAY_F_CONTIGUOUS and
+                not (self.flags & NPY.ARRAY_F_CONTIGUOUS or
                      self.flags & NPY.ARRAY_C_CONTIGUOUS)):
            raise oefmt(errtype, "ndarray is not contiguous")
         if ((flags & space.BUF_STRIDES) != space.BUF_STRIDES and


More information about the pypy-commit mailing list