Author: Matti Picus <[email protected]>
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
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
