From 02ab23fcb81433e7e50292dc6a6ebf3a80353416 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Wed, 24 Jun 2015 18:47:10 +0900 Subject: [PATCH] python3: Use items instead of iteritems Signed-off-by: IWAMOTO Toshihiro Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_5_parser.py | 4 ++-- ryu/tests/unit/ofproto/test_parser_ofpstats.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_5_parser.py b/ryu/ofproto/ofproto_v1_5_parser.py index b5a28f4e..b7152a88 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -858,7 +858,7 @@ class OFPStats(StringifyMixin): self.fields = _ordered_fields else: fields = [ofproto.oxs_from_user(k, v) for (k, v) - in kwargs.iteritems()] + in kwargs.items()] # sort by OXS type values fields.sort() # No mask @@ -923,7 +923,7 @@ class OFPStats(StringifyMixin): return key in dict(self.fields) def iteritems(self): - return dict(self.fields).iteritems() + return dict(self.fields).items() def get(self, key, default=None): return dict(self.fields).get(key, default) diff --git a/ryu/tests/unit/ofproto/test_parser_ofpstats.py b/ryu/tests/unit/ofproto/test_parser_ofpstats.py index 10ad83e2..74d7a499 100644 --- a/ryu/tests/unit/ofproto/test_parser_ofpstats.py +++ b/ryu/tests/unit/ofproto/test_parser_ofpstats.py @@ -49,7 +49,7 @@ class Test_Parser_OFPStats(unittest.TestCase): b = bytearray() stats.serialize(b, 0) stats2 = stats.parser(six.binary_type(b), 0) - for k, v in d.iteritems(): + for k, v in d.items(): ok_(k in stats) ok_(k in stats2) eq_(stats[k], v)