python: futurize -f libfuturize.fixes.fix_next_call
Change obj.next() calls to next(obj). This is necessary for Python 3 compatibility. Done using: $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \ sort -u | grep -v README.sh4) $ futurize -w -f libfuturize.fixes.fix_next_call $py Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20180608122952.2009-4-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
068cf7a44c
commit
d24d523c14
@ -71,9 +71,9 @@ class OrderedDict(dict, DictMixin):
|
|||||||
if not self:
|
if not self:
|
||||||
raise KeyError('dictionary is empty')
|
raise KeyError('dictionary is empty')
|
||||||
if last:
|
if last:
|
||||||
key = reversed(self).next()
|
key = next(reversed(self))
|
||||||
else:
|
else:
|
||||||
key = iter(self).next()
|
key = next(iter(self))
|
||||||
value = self.pop(key)
|
value = self.pop(key)
|
||||||
return key, value
|
return key, value
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||||||
while True:
|
while True:
|
||||||
if advance_src:
|
if advance_src:
|
||||||
try:
|
try:
|
||||||
s_item = s_iter.next()
|
s_item = next(s_iter)
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
if s_iter_list == []:
|
if s_iter_list == []:
|
||||||
break
|
break
|
||||||
@ -173,7 +173,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
|
|||||||
|
|
||||||
if advance_dest:
|
if advance_dest:
|
||||||
try:
|
try:
|
||||||
d_item = d_iter.next()
|
d_item = next(d_iter)
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
if d_iter_list == []:
|
if d_iter_list == []:
|
||||||
# We were not in a substruct
|
# We were not in a substruct
|
||||||
|
@ -422,7 +422,7 @@ if __name__ == '__main__':
|
|||||||
test_id = count(1)
|
test_id = count(1)
|
||||||
while should_continue(duration, start_time):
|
while should_continue(duration, start_time):
|
||||||
try:
|
try:
|
||||||
run_test(str(test_id.next()), seed, work_dir, run_log, cleanup,
|
run_test(str(next(test_id)), seed, work_dir, run_log, cleanup,
|
||||||
log_all, command, config)
|
log_all, command, config)
|
||||||
except (KeyboardInterrupt, SystemExit):
|
except (KeyboardInterrupt, SystemExit):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
Loading…
Reference in New Issue
Block a user