From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: use next() builting instead of deprecated method
......................................................................
py3: use next() builting instead of deprecated method
Change-Id: I95d4dea51fc6e9ec21ea88c47cc18750cdfa9ac3
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/network/tc/__init__.py
M lib/vdsm/osinfo.py
M tests/stompasyncdispatcher_test.py
M tests/storage_misc_test.py
M vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
M vdsm_hooks/smbios/before_vm_start.py
6 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/78346/1
diff --git a/lib/vdsm/network/tc/__init__.py b/lib/vdsm/network/tc/__init__.py
index 3f22064..bbdc5f7 100644
--- a/lib/vdsm/network/tc/__init__.py
+++ b/lib/vdsm/network/tc/__init__.py
@@ -79,7 +79,7 @@
_addTarget(network, QDISC_INGRESS, target)
qdisc.replace(network, 'prio', parent=None)
- qdisc_id = _qdiscs_of_device(network).next()
+ qdisc_id = next(_qdiscs_of_device(network))
_addTarget(network, qdisc_id, target)
ipwrapper.getLink(network).promisc = True
@@ -98,7 +98,7 @@
'''
acts = _delTarget(network, QDISC_INGRESS, target)
try:
- qdisc_id = _qdiscs_of_device(network).next()
+ qdisc_id = next(_qdiscs_of_device(network))
acts += _delTarget(network, qdisc_id, target)
except StopIteration:
pass
diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py
index 2b130d8..440987e 100644
--- a/lib/vdsm/osinfo.py
+++ b/lib/vdsm/osinfo.py
@@ -269,8 +269,8 @@
for pkg, names in KEY_PACKAGES.iteritems():
try:
- mi = itertools.chain(*[ts.dbMatch('name', name)
- for name in names]).next()
+ mi = next(itertools.chain(
+ *[ts.dbMatch('name', name) for name in names]))
except StopIteration:
logging.debug("rpm package %s not found",
KEY_PACKAGES[pkg])
diff --git a/tests/stompasyncdispatcher_test.py b/tests/stompasyncdispatcher_test.py
index ea95355..1838b77 100644
--- a/tests/stompasyncdispatcher_test.py
+++ b/tests/stompasyncdispatcher_test.py
@@ -79,9 +79,9 @@
self._chain = itertools.chain(list)
def get_fake_time(self):
- next = self._chain.next()
- print(next)
- return next
+ next_time = next(self._chain)
+ print(next_time)
+ return next_time
class AsyncDispatcherTest(TestCaseBase):
diff --git a/tests/storage_misc_test.py b/tests/storage_misc_test.py
index da928db..53e60a9 100644
--- a/tests/storage_misc_test.py
+++ b/tests/storage_misc_test.py
@@ -197,7 +197,7 @@
def testInvalidITMapParams(self):
data = 1
- self.assertRaises(ValueError, misc.itmap(int, data, 0).next)
+ self.assertRaises(ValueError, lambda: next(misc.itmap(int, data, 0)))
class ParseHumanReadableSize(TestCaseBase):
diff --git a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
index ebba2a1..e6f9250 100644
--- a/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
+++ b/vdsm_hooks/fakevmstats/after_get_all_vm_stats.py
@@ -158,19 +158,19 @@
diskUsage.append(createDiskUsage('/boot', 'ext4', 1 * GB))
diskUsage.append(createDiskUsage('/home', 'ext4', 50 * GB))
# Add guest-specific number of extra mounts
- for i in range(vmDigest.next() % MAX_DYNAMIC_MOUNTS):
+ for i in range(next(vmDigest) % MAX_DYNAMIC_MOUNTS):
diskUsage.append(createDiskUsage('/mount/dynamic-%d' % i,
'ext4',
- vmDigest.next() * GB))
+ next(vmDigest) * GB))
stats['diskUsage'] = diskUsage
# Each vm between 1 to 3 ifaces, not dynamic:
netIfaces = []
- for i in range(1 + (vmDigest.next() % 3)):
+ for i in range(1 + (next(vmDigest) % 3)):
netif = {}
- hw = map(lambda x: vmDigest.next(), range(6))
+ hw = map(lambda x: next(vmDigest), range(6))
netif['hw'] = ETH_HW_ADDR_FORMAT % (hw[0], hw[1], hw[2], hw[3], hw[4],
hw[5])
- inet = map(lambda x: vmDigest.next(), range(4))
+ inet = map(lambda x: next(vmDigest), range(4))
netif['inet'] = ['%d.%d.%d.%d' % (inet[0], inet[1], inet[2],
inet[3])]
# For simplicty purposes, the ipv6 addresses are transition from ipv4
netif['inet6'] = ['0:0:0:0:0:ffff:%x%02x:%x%02x' % (inet[0],
inet[1],
diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py
index f46cdae..14abbeb 100755
--- a/vdsm_hooks/smbios/before_vm_start.py
+++ b/vdsm_hooks/smbios/before_vm_start.py
@@ -38,7 +38,7 @@
break
if not updated:
- name = entry.iterkeys().next()
+ name = next(entry.iterkeys())
e = domxml.createElement('entry')
e.setAttribute('name', name)
txt = domxml.createTextNode(entry[name])
@@ -65,7 +65,7 @@
break
if not updated:
- name = entry.iterkeys().next()
+ name = next(entry.iterkeys())
e = domxml.createElement('entry')
e.setAttribute('name', name)
txt = domxml.createTextNode(entry[name])
@@ -94,7 +94,7 @@
for d in data.split('^'):
# convert string to dictionary
entry = ast.literal_eval(d)
- name = entry.iterkeys().next()
+ name = next(entry.iterkeys())
if name in bios_entries:
addBiosEntry(domxml, sysinfo, entry)
else:
--
To view, visit
https://gerrit.ovirt.org/78346
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95d4dea51fc6e9ec21ea88c47cc18750cdfa9ac3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>