diff --git a/skimage/morphology/selem.py b/skimage/morphology/selem.py index f2234ffb..41be0737 100644 --- a/skimage/morphology/selem.py +++ b/skimage/morphology/selem.py @@ -84,7 +84,7 @@ def diamond(radius, dtype=np.uint8): are 1 and 0 otherwise. """ half = radius - (I, J) = np.meshgrid(xrange(0, radius * 2 + 1), xrange(0, radius * 2 + 1)) + (I, J) = np.meshgrid(range(0, radius * 2 + 1), range(0, radius * 2 + 1)) s = np.abs(I - half) + np.abs(J - half) return np.array(s <= radius, dtype=dtype) diff --git a/skimage/segmentation/tests/test_felzenszwalb.py b/skimage/segmentation/tests/test_felzenszwalb.py index ebda2a38..8a7abfc4 100644 --- a/skimage/segmentation/tests/test_felzenszwalb.py +++ b/skimage/segmentation/tests/test_felzenszwalb.py @@ -14,7 +14,7 @@ def test_grey(): # we expect 4 segments: assert_equal(len(np.unique(seg)), 4) # that mostly respect the 4 regions: - for i in xrange(4): + for i in range(4): hist = np.histogram(img[seg == i], bins=[0, 0.1, 0.3, 0.5, 1])[0] assert_greater(hist[i], 40) diff --git a/skimage/segmentation/tests/test_quickshift.py b/skimage/segmentation/tests/test_quickshift.py index 5c6eb024..eebcaf0d 100644 --- a/skimage/segmentation/tests/test_quickshift.py +++ b/skimage/segmentation/tests/test_quickshift.py @@ -16,7 +16,7 @@ def test_grey(): # we expect 4 segments: assert_equal(len(np.unique(seg)), 4) # that mostly respect the 4 regions: - for i in xrange(4): + for i in range(4): hist = np.histogram(img[seg == i], bins=[0, 0.1, 0.3, 0.5, 1])[0] assert_greater(hist[i], 20)