Author: mattip <[email protected]>
Branch: numpy-1.10
Changeset: r80766:13cd949305f6
Date: 2015-11-16 22:06 +0200
http://bitbucket.org/pypy/pypy/changeset/13cd949305f6/
Log: reflect the current status of boolean indexing in tests
diff --git a/pypy/module/micronumpy/test/test_deprecations.py
b/pypy/module/micronumpy/test/test_deprecations.py
--- a/pypy/module/micronumpy/test/test_deprecations.py
+++ b/pypy/module/micronumpy/test/test_deprecations.py
@@ -9,23 +9,25 @@
def test_getitem(self):
import numpy as np
- import warnings
+ import warnings, sys
warnings.simplefilter('error', np.VisibleDeprecationWarning)
try:
arr = np.ones((5, 4, 3))
index = np.array([True])
- #self.assert_deprecated(arr.__getitem__, args=(index,))
raises(np.VisibleDeprecationWarning, arr.__getitem__, index)
index = np.array([False] * 6)
- #self.assert_deprecated(arr.__getitem__, args=(index,))
raises(np.VisibleDeprecationWarning, arr.__getitem__, index)
index = np.zeros((4, 4), dtype=bool)
- #self.assert_deprecated(arr.__getitem__, args=(index,))
- raises(np.VisibleDeprecationWarning, arr.__getitem__, index)
- #self.assert_deprecated(arr.__getitem__, args=((slice(None),
index),))
- raises(np.VisibleDeprecationWarning, arr.__getitem__,
(slice(None), index))
+ if '__pypy__' in sys.builtin_module_names:
+ # boolean indexing matches the dims in index
+ # to the first index.ndims in arr, not implemented in pypy yet
+ raises(IndexError, arr.__getitem__, index)
+ raises(TypeError, arr.__getitem__, (slice(None), index))
+ else:
+ raises(np.VisibleDeprecationWarning, arr.__getitem__, index)
+ raises(np.VisibleDeprecationWarning, arr.__getitem__,
(slice(None), index))
finally:
warnings.simplefilter('default', np.VisibleDeprecationWarning)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
