diff options
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/extras.py | 4 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 12 | ||||
| -rw-r--r-- | numpy/ma/tests/test_old_ma.py | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 857d72249..77d2dbb36 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -337,7 +337,7 @@ def apply_along_axis(func1d, axis, arr, *args, **kwargs): % (axis, nd)) ind = [0] * (nd - 1) i = np.zeros(nd, 'O') - indlist = range(nd) + indlist = list(range(nd)) indlist.remove(axis) i[axis] = slice(None, None) outshape = np.asarray(arr.shape).take(indlist) @@ -729,7 +729,7 @@ def compress_rowcols(x, axis=None): if m.all(): return nxarray([]) # Builds a list of rows/columns indices - (idxr, idxc) = (range(len(x)), range(x.shape[1])) + (idxr, idxc) = (list(range(len(x))), list(range(x.shape[1]))) masked = m.nonzero() if not axis: for i in np.unique(masked[0]): diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index cf8f1111d..a11bf6943 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -381,7 +381,7 @@ class TestMaskedArray(TestCase): def test_pickling_subbaseclass(self): "Test pickling w/ a subclass of ndarray" import cPickle - a = array(np.matrix(range(10)), mask=[1, 0, 1, 0, 0] * 2) + a = array(np.matrix(list(range(10))), mask=[1, 0, 1, 0, 0] * 2) a_pickled = cPickle.loads(a.dumps()) assert_equal(a_pickled._mask, a._mask) assert_equal(a_pickled, a) @@ -2983,11 +2983,11 @@ class TestMaskedArrayFunctions(TestCase): def test_masked_otherfunctions(self): - assert_equal(masked_inside(range(5), 1, 3), [0, 199, 199, 199, 4]) - assert_equal(masked_outside(range(5), 1, 3), [199, 1, 2, 3, 199]) - assert_equal(masked_inside(array(range(5), mask=[1, 0, 0, 0, 0]), 1, 3).mask, [1, 1, 1, 1, 0]) - assert_equal(masked_outside(array(range(5), mask=[0, 1, 0, 0, 0]), 1, 3).mask, [1, 1, 0, 0, 1]) - assert_equal(masked_equal(array(range(5), mask=[1, 0, 0, 0, 0]), 2).mask, [1, 0, 1, 0, 0]) + assert_equal(masked_inside(list(range(5)), 1, 3), [0, 199, 199, 199, 4]) + assert_equal(masked_outside(list(range(5)), 1, 3), [199, 1, 2, 3, 199]) + assert_equal(masked_inside(array(list(range(5)), mask=[1, 0, 0, 0, 0]), 1, 3).mask, [1, 1, 1, 1, 0]) + assert_equal(masked_outside(array(list(range(5)), mask=[0, 1, 0, 0, 0]), 1, 3).mask, [1, 1, 0, 0, 1]) + assert_equal(masked_equal(array(list(range(5)), mask=[1, 0, 0, 0, 0]), 2).mask, [1, 0, 1, 0, 0]) assert_equal(masked_not_equal(array([2, 2, 1, 2, 1], mask=[1, 0, 0, 0, 0]), 2).mask, [1, 0, 1, 0, 1]) diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py index c9dbe4d4a..b04e8ab37 100644 --- a/numpy/ma/tests/test_old_ma.py +++ b/numpy/ma/tests/test_old_ma.py @@ -388,13 +388,13 @@ class TestMa(TestCase): assert_(eq(masked_where(not_equal(x, 2), x), masked_not_equal(x, 2))) assert_(eq(masked_where(equal(x, 2), x), masked_equal(x, 2))) assert_(eq(masked_where(not_equal(x, 2), x), masked_not_equal(x, 2))) - assert_(eq(masked_inside(range(5), 1, 3), [0, 199, 199, 199, 4])) - assert_(eq(masked_outside(range(5), 1, 3), [199, 1, 2, 3, 199])) - assert_(eq(masked_inside(array(range(5), mask=[1, 0, 0, 0, 0]), 1, 3).mask, + assert_(eq(masked_inside(list(range(5)), 1, 3), [0, 199, 199, 199, 4])) + assert_(eq(masked_outside(list(range(5)), 1, 3), [199, 1, 2, 3, 199])) + assert_(eq(masked_inside(array(list(range(5)), mask=[1, 0, 0, 0, 0]), 1, 3).mask, [1, 1, 1, 1, 0])) - assert_(eq(masked_outside(array(range(5), mask=[0, 1, 0, 0, 0]), 1, 3).mask, + assert_(eq(masked_outside(array(list(range(5)), mask=[0, 1, 0, 0, 0]), 1, 3).mask, [1, 1, 0, 0, 1])) - assert_(eq(masked_equal(array(range(5), mask=[1, 0, 0, 0, 0]), 2).mask, + assert_(eq(masked_equal(array(list(range(5)), mask=[1, 0, 0, 0, 0]), 2).mask, [1, 0, 1, 0, 0])) assert_(eq(masked_not_equal(array([2, 2, 1, 2, 1], mask=[1, 0, 0, 0, 0]), 2).mask, [1, 0, 1, 0, 1])) |