Commit c36b5dab authored by Radostin Stoyanov's avatar Radostin Stoyanov Committed by Andrei Vagin

python: Replace xrange with range

In Py2 `range` returns a list and `xrange` creates a sequence object
that evaluates lazily. In Py3 `range` is equivalent to `xrange` in Py2.
Signed-off-by: 's avatarRadostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@gmail.com>
parent 7064cbaa
...@@ -625,7 +625,7 @@ class coredump_generator: ...@@ -625,7 +625,7 @@ class coredump_generator:
off = 0# in pages off = 0# in pages
for m in pagemap[1:]: for m in pagemap[1:]:
found = False found = False
for i in xrange(m["nr_pages"]): for i in range(m["nr_pages"]):
if m["vaddr"] + i*PAGESIZE == page_no*PAGESIZE: if m["vaddr"] + i*PAGESIZE == page_no*PAGESIZE:
found = True found = True
break break
......
...@@ -19,13 +19,13 @@ def mix(nr_tasks, nr_pipes): ...@@ -19,13 +19,13 @@ def mix(nr_tasks, nr_pipes):
# First -- make a full set of combinations for a single pipe. # First -- make a full set of combinations for a single pipe.
max_idx = 1 << nr_tasks max_idx = 1 << nr_tasks
pipe_mix = [[(r, w)] for r in xrange(0, max_idx) for w in xrange(0, max_idx)] pipe_mix = [[(r, w)] for r in range(0, max_idx) for w in range(0, max_idx)]
# Now, for every pipe throw another one into the game making # Now, for every pipe throw another one into the game making
# all possible combinations of what was seen before with the # all possible combinations of what was seen before with the
# newbie. # newbie.
pipes_mix = pipe_mix pipes_mix = pipe_mix
for t in xrange(1, nr_pipes): for t in range(1, nr_pipes):
pipes_mix = [ o + n for o in pipes_mix for n in pipe_mix ] pipes_mix = [ o + n for o in pipes_mix for n in pipe_mix ]
return pipes_mix return pipes_mix
...@@ -38,7 +38,7 @@ def make_pipes(task_nr, nr_pipes, pipes, comb, status_pipe): ...@@ -38,7 +38,7 @@ def make_pipes(task_nr, nr_pipes, pipes, comb, status_pipe):
# We need to make sure that pipes have their # We need to make sure that pipes have their
# ends according to comb for task_nr # ends according to comb for task_nr
for i in xrange(0, nr_pipes): for i in range(0, nr_pipes):
# Read end # Read end
if not (comb[i][0] & (1 << task_nr)): if not (comb[i][0] & (1 << task_nr)):
os.close(pipes[i][0]) os.close(pipes[i][0])
...@@ -137,13 +137,13 @@ def make_comb(comb, opts, status_pipe): ...@@ -137,13 +137,13 @@ def make_comb(comb, opts, status_pipe):
print('\tMake pipes') print('\tMake pipes')
# 1st -- make needed pipes # 1st -- make needed pipes
pipes = [] pipes = []
for p in xrange(0, opts.pipes): for p in range(0, opts.pipes):
pipes.append(os.pipe()) pipes.append(os.pipe())
# Fork the kids that'll make pipes # Fork the kids that'll make pipes
kc_pipe = os.pipe() kc_pipe = os.pipe()
kids = [] kids = []
for t in xrange(0, opts.tasks): for t in range(0, opts.tasks):
pid = os.fork() pid = os.fork()
if pid == 0: if pid == 0:
os.close(status_pipe) os.close(status_pipe)
......
...@@ -23,7 +23,7 @@ root = tempfile.mkdtemp(prefix = "root.mount", dir = "/tmp") ...@@ -23,7 +23,7 @@ root = tempfile.mkdtemp(prefix = "root.mount", dir = "/tmp")
mount(None, root, 1, 0, 0) mount(None, root, 1, 0, 0)
mounts = [root] mounts = [root]
for i in xrange(10): for i in range(10):
dstdir = random.choice(mounts) dstdir = random.choice(mounts)
dst = tempfile.mkdtemp(prefix = "mount", dir = dstdir) dst = tempfile.mkdtemp(prefix = "mount", dir = dstdir)
src = random.choice(mounts + [None]) src = random.choice(mounts + [None])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment