Merge pull request #3122 from charris/2to3-apply-xrange-fixer

2to3: Replace xrange by range and use list(range(...)) where needed

2 files changed, 5 insertions, 5 deletions

diff --git a/numpy/testing/tests/test_decorators.py b/numpy/testing/tests/test_decorators.py
index e2dc2bd7d..22d39e9a6 100644
--- a/numpy/testing/tests/test_decorators.py
+++ b/numpy/testing/tests/test_decorators.py
@@ -88,7 +88,7 @@ def test_skip_functions_callable():
 def test_skip_generators_hardcoded():
     @dec.knownfailureif(True, "This test is known to fail")
     def g1(x):
-        for i in xrange(x):
+        for i in range(x):
             yield i
 
     try:
@@ -102,7 +102,7 @@ def test_skip_generators_hardcoded():
 
     @dec.knownfailureif(False, "This test is NOT known to fail")
     def g2(x):
-        for i in xrange(x):
+        for i in range(x):
             yield i
         raise DidntSkipException('FAIL')
 
@@ -121,7 +121,7 @@ def test_skip_generators_callable():
 
     @dec.knownfailureif(skip_tester, "This test is known to fail")
     def g1(x):
-        for i in xrange(x):
+        for i in range(x):
             yield i
 
     try:
@@ -136,7 +136,7 @@ def test_skip_generators_callable():
 
     @dec.knownfailureif(skip_tester, "This test is NOT known to fail")
     def g2(x):
-        for i in xrange(x):
+        for i in range(x):
             yield i
         raise DidntSkipException('FAIL')
 
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
index 9722c583c..4dd5a8121 100644
--- a/numpy/testing/tests/test_utils.py
+++ b/numpy/testing/tests/test_utils.py
@@ -378,7 +378,7 @@ class TestArrayAlmostEqualNulp(unittest.TestCase):
     @dec.knownfailureif(True, "Github issue #347")
     def test_simple(self):
         np.random.seed(12345)
-        for i in xrange(100):
+        for i in range(100):
             dev = np.random.randn(10)
             x = np.ones(10)
             y = x + dev * np.finfo(np.float64).eps