mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-17 12:41:32 +00:00
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>
This commit is contained in:
parent
dffd56d1d2
commit
b8c455500a
3 changed files with 6 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue