diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-05 21:43:22 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-27 18:42:34 -0600 |
| commit | 91aa03f4a1065319e85c6ee90306971c301fd58c (patch) | |
| tree | c4d40c32610eccebb71ad1f52c4f389c0d1b86b0 /numpy/testing | |
| parent | 1a816c79f7212102634c28e0896547671d347a60 (diff) | |
| download | numpy-91aa03f4a1065319e85c6ee90306971c301fd58c.tar.gz | |
2to3: Replace xrange by range and use list(range(...)) where needed
In python3 range is an iterator and `xrange` has been removed. This has
two consequence for code:
1) Where a list is needed `list(range(...))` must be used.
2) `xrange` must be replaced by `range`
Both of these changes also work in python2 and this patch makes both.
There are three places fixed that do not need it, but I left them in
so that the result would be `xrange` clean.
Closes #3092
Diffstat (limited to 'numpy/testing')
| -rw-r--r-- | numpy/testing/tests/test_decorators.py | 8 | ||||
| -rw-r--r-- | numpy/testing/tests/test_utils.py | 2 |
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 |