From 91aa03f4a1065319e85c6ee90306971c301fd58c Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Tue, 5 Mar 2013 21:43:22 -0700 Subject: 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 --- numpy/f2py/crackfortran.py | 2 +- numpy/f2py/tests/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'numpy/f2py') diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 76e113a67..95ebcaee4 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -292,7 +292,7 @@ def readfortrancode(ffile,dowithline=show,istop=1): mline_mark = re.compile(r".*?'''") if istop: dowithline('',-1) ll,l1='','' - spacedigits=[' ']+map(str,range(10)) + spacedigits=[' ']+map(str,list(range(10))) filepositiontext='' fin=fileinput.FileInput(ffile) while 1: diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py index 0584ae188..215df9553 100644 --- a/numpy/f2py/tests/util.py +++ b/numpy/f2py/tests/util.py @@ -58,7 +58,7 @@ def get_module_dir(): def get_temp_module_name(): # Assume single-threaded, and the module dir usable only by this thread d = get_module_dir() - for j in xrange(5403, 9999999): + for j in range(5403, 9999999): name = "_test_ext_module_%d" % j fn = os.path.join(d, name) if name not in sys.modules and not os.path.isfile(fn+'.py'): -- cgit v1.2.1