summaryrefslogtreecommitdiff
path: root/test/py
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-09-14 14:34:44 -0700
committerSimon Glass <sjg@chromium.org>2018-07-10 14:50:50 -0600
commitb8c455500a08c75c4809e523d348027e72cda7ec (patch)
tree2ed0c97c155bd3e8b342034fe3031019b9d7c051 /test/py
parentdffd56d1d270e4797e43272a6c9000b8b8aeaf29 (diff)
test/py: Use range() rather than xrange()
In python 3.x the xrange() function has been removed, and range() returns an iterator much like Python 2.x's xrange(). Simply use range() in place of xrange() in order to work on both python 2.x & 3.x. This will mean a small cost on python 2.x since range() will return a list there rather than an iterator, but the cost should be negligible. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'test/py')
-rw-r--r--test/py/u_boot_console_sandbox.py2
-rw-r--r--test/py/u_boot_spawn.py6
-rw-r--r--test/py/u_boot_utils.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/py/u_boot_console_sandbox.py b/test/py/u_boot_console_sandbox.py
index c901397e1c1..778f6d0983d 100644
--- a/test/py/u_boot_console_sandbox.py
+++ b/test/py/u_boot_console_sandbox.py
@@ -81,7 +81,7 @@ class ConsoleSandbox(ConsoleBase):
p = self.p
self.p = None
- for i in xrange(100):
+ for i in range(100):
ret = not p.isalive()
if ret:
break
diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py
index 77a010a33f0..b011a3e3da2 100644
--- a/test/py/u_boot_spawn.py
+++ b/test/py/u_boot_spawn.py
@@ -134,7 +134,7 @@ class Spawn(object):
the expected time.
"""
- for pi in xrange(len(patterns)):
+ for pi in range(len(patterns)):
if type(patterns[pi]) == type(''):
patterns[pi] = re.compile(patterns[pi])
@@ -143,7 +143,7 @@ class Spawn(object):
while True:
earliest_m = None
earliest_pi = None
- for pi in xrange(len(patterns)):
+ for pi in range(len(patterns)):
pattern = patterns[pi]
m = pattern.search(self.buf)
if not m:
@@ -198,7 +198,7 @@ class Spawn(object):
"""
os.close(self.fd)
- for i in xrange(100):
+ for i in range(100):
if not self.isalive():
break
time.sleep(0.1)
diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py
index bb31e57b279..d68d1dd1054 100644
--- a/test/py/u_boot_utils.py
+++ b/test/py/u_boot_utils.py
@@ -120,7 +120,7 @@ def wait_until_open_succeeds(fn):
An open file handle to the file.
"""
- for i in xrange(100):
+ for i in range(100):
fh = attempt_to_open_file(fn)
if fh:
return fh
@@ -143,7 +143,7 @@ def wait_until_file_open_fails(fn, ignore_errors):
Nothing.
"""
- for i in xrange(100):
+ for i in range(100):
fh = attempt_to_open_file(fn)
if not fh:
return