iteritems() was renamed as items() to support Python3. In accordance with this change, this patch adds items() into OFPMatch/OFPStats class for convenience.
Reported-by: Ed Kiefer <[email protected]> Signed-off-by: IWASE Yusuke <[email protected]> --- ryu/ofproto/ofproto_v1_2_parser.py | 3 +++ ryu/ofproto/ofproto_v1_3_parser.py | 3 +++ ryu/ofproto/ofproto_v1_4_parser.py | 3 +++ ryu/ofproto/ofproto_v1_5_parser.py | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index 60b5ded..cd67a9b 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -3415,6 +3415,9 @@ class OFPMatch(StringifyMixin): def iteritems(self): return iter(dict(self._fields2).items()) + def items(self): + return self._fields2 + def get(self, key, default=None): return dict(self._fields2).get(key, default) diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index 85b8029..663344c 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -848,6 +848,9 @@ class OFPMatch(StringifyMixin): def iteritems(self): return iter(dict(self._fields2).items()) + def items(self): + return self._fields2 + def get(self, key, default=None): return dict(self._fields2).get(key, default) diff --git a/ryu/ofproto/ofproto_v1_4_parser.py b/ryu/ofproto/ofproto_v1_4_parser.py index 9d2a513..9b2ec6b 100644 --- a/ryu/ofproto/ofproto_v1_4_parser.py +++ b/ryu/ofproto/ofproto_v1_4_parser.py @@ -783,6 +783,9 @@ class OFPMatch(StringifyMixin): def iteritems(self): return iter(dict(self._fields2).items()) + def items(self): + return self._fields2 + def get(self, key, default=None): return dict(self._fields2).get(key, default) diff --git a/ryu/ofproto/ofproto_v1_5_parser.py b/ryu/ofproto/ofproto_v1_5_parser.py index 07b1ae0..c7d3fde 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -784,6 +784,9 @@ class OFPMatch(StringifyMixin): def iteritems(self): return iter(dict(self._fields2).items()) + def items(self): + return self._fields2 + def get(self, key, default=None): return dict(self._fields2).get(key, default) @@ -925,6 +928,9 @@ class OFPStats(StringifyMixin): def iteritems(self): return dict(self.fields).items() + def items(self): + return self.fields + def get(self, key, default=None): return dict(self.fields).get(key, default) -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
