Use next(i) instead of i.next() for iteration, which works both in python2 and 3.
Signed-off-by: IWAMOTO Toshihiro <[email protected]> --- ryu/tests/unit/packet/test_bfd.py | 32 ++++++++++++++++---------------- ryu/tests/unit/packet/test_lldp.py | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ryu/tests/unit/packet/test_bfd.py b/ryu/tests/unit/packet/test_bfd.py index 7f0fd8c..d33949c 100644 --- a/ryu/tests/unit/packet/test_bfd.py +++ b/ryu/tests/unit/packet/test_bfd.py @@ -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)) diff --git a/ryu/tests/unit/packet/test_lldp.py b/ryu/tests/unit/packet/test_lldp.py index 3612fa8..394bff3 100644 --- a/ryu/tests/unit/packet/test_lldp.py +++ b/ryu/tests/unit/packet/test_lldp.py @@ -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 -- 2.1.4 ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
