openstack/deb-ryu
Code Issues Proposed changes

python3: Adapt to iterator change

Browse Source 
Use next(i) instead of i.next() for iteration, which works both
in python2 and 3.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWAMOTO Toshihiro
2015-07-03 11:27:13 +09:00
committed by FUJITA Tomonori
parent f99b504742
commit 01ac890ec8
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ryu/tests/unit/packet/test_bfd.py
View File

@@ -95,21 +95,21 @@ class TestBFD(unittest.TestCase):
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), ipv4.ipv4)
eq_(type(i.next()), udp.udp)
eq_(type(bfd.bfd.parser(i.next())[0]), bfd.bfd)
eq_(type(next(i)), ethernet.ethernet)
eq_(type(next(i)), ipv4.ipv4)
eq_(type(next(i)), udp.udp)
eq_(type(bfd.bfd.parser(next(i))[0]), bfd.bfd)
def test_parse_with_auth_simple(self):
buf = self.data_auth_simple
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), ipv4.ipv4)
eq_(type(i.next()), udp.udp)
eq_(type(next(i)), ethernet.ethernet)
eq_(type(next(i)), ipv4.ipv4)
eq_(type(next(i)), udp.udp)
bfd_obj = bfd.bfd.parser(i.next())[0]
bfd_obj = bfd.bfd.parser(next(i))[0]
eq_(type(bfd_obj), bfd.bfd)
eq_(type(bfd_obj.auth_cls), bfd.SimplePassword)
ok_(bfd_obj.authenticate(self.auth_keys))
@@ -119,11 +119,11 @@ class TestBFD(unittest.TestCase):
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), ipv4.ipv4)
eq_(type(i.next()), udp.udp)
eq_(type(next(i)), ethernet.ethernet)
eq_(type(next(i)), ipv4.ipv4)
eq_(type(next(i)), udp.udp)
bfd_obj = bfd.bfd.parser(i.next())[0]
bfd_obj = bfd.bfd.parser(next(i))[0]
eq_(type(bfd_obj), bfd.bfd)
eq_(type(bfd_obj.auth_cls), bfd.KeyedMD5)
ok_(bfd_obj.authenticate(self.auth_keys))
@@ -133,11 +133,11 @@ class TestBFD(unittest.TestCase):
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), ipv4.ipv4)
eq_(type(i.next()), udp.udp)
eq_(type(next(i)), ethernet.ethernet)
eq_(type(next(i)), ipv4.ipv4)
eq_(type(next(i)), udp.udp)
bfd_obj = bfd.bfd.parser(i.next())[0]
bfd_obj = bfd.bfd.parser(next(i))[0]
eq_(type(bfd_obj), bfd.bfd)
eq_(type(bfd_obj.auth_cls), bfd.KeyedSHA1)
ok_(bfd_obj.authenticate(self.auth_keys))

8
ryu/tests/unit/packet/test_lldp.py
View File

@@ -74,8 +74,8 @@ class TestLLDPMandatoryTLV(unittest.TestCase):
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), lldp.lldp)
eq_(type(next(i)), ethernet.ethernet)
eq_(type(next(i)), lldp.lldp)
def test_tlv(self):
tlv = lldp.ChassisID(subtype=lldp.ChassisID.SUB_MAC_ADDRESS,
@@ -242,8 +242,8 @@ class TestLLDPOptionalTLV(unittest.TestCase):
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(i.next()), ethernet.ethernet)
lldp_pkt = i.next()
eq_(type(next(i)), ethernet.ethernet)
lldp_pkt = next(i)
eq_(type(lldp_pkt), lldp.lldp)
tlvs = lldp_pkt.tlvs