mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 22:06:10 +02:00
Code Issues Projects Releases Wiki Activity

python3: Use items instead of iteritems

Browse Source 
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-06-24 18:47:10 +09:00 committed by FUJITA Tomonori
parent 5ab96772b8
commit 02ab23fcb8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/ofproto/ofproto_v1_5_parser.py
View File

@ -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)

2
ryu/tests/unit/ofproto/test_parser_ofpstats.py
View File

@ -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)