Avoid itertools micro-optimization and simply use zip.
Signed-off-by: IWAMOTO Toshihiro <[email protected]>
---
ryu/ofproto/nx_match.py | 6 +++---
ryu/ofproto/ofproto_v1_2_parser.py | 4 ++--
ryu/ofproto/ofproto_v1_3_parser.py | 4 ++--
ryu/tests/unit/ofproto/test_parser_v12.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ryu/ofproto/nx_match.py b/ryu/ofproto/nx_match.py
index ec74160..47fc8f3 100644
--- a/ryu/ofproto/nx_match.py
+++ b/ryu/ofproto/nx_match.py
@@ -263,14 +263,14 @@ class ClsRule(object):
def set_ipv6_src_masked(self, src, mask):
self.wc.ipv6_src_mask = mask
- self.flow.ipv6_src = [x & y for (x, y) in itertools.izip(src, mask)]
+ self.flow.ipv6_src = [x & y for (x, y) in zip(src, mask)]
def set_ipv6_src(self, src):
self.flow.ipv6_src = src
def set_ipv6_dst_masked(self, dst, mask):
self.wc.ipv6_dst_mask = mask
- self.flow.ipv6_dst = [x & y for (x, y) in itertools.izip(dst, mask)]
+ self.flow.ipv6_dst = [x & y for (x, y) in zip(dst, mask)]
def set_ipv6_dst(self, dst):
self.flow.ipv6_dst = dst
@@ -278,7 +278,7 @@ class ClsRule(object):
def set_nd_target_masked(self, target, mask):
self.wc.nd_target_mask = mask
self.flow.nd_target = [x & y for (x, y) in
- itertools.izip(target, mask)]
+ zip(target, mask)]
def set_nd_target(self, target):
self.flow.nd_target = target
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py
b/ryu/ofproto/ofproto_v1_2_parser.py
index d3f8630..66dbeab 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -3971,7 +3971,7 @@ class OFPMatch(StringifyMixin):
def set_ipv6_src_masked(self, src, mask):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_SRC)
self._wc.ipv6_src_mask = mask
- self._flow.ipv6_src = [x & y for (x, y) in itertools.izip(src, mask)]
+ self._flow.ipv6_src = [x & y for (x, y) in zip(src, mask)]
def set_ipv6_dst(self, dst):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_DST)
@@ -3980,7 +3980,7 @@ class OFPMatch(StringifyMixin):
def set_ipv6_dst_masked(self, dst, mask):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_DST)
self._wc.ipv6_dst_mask = mask
- self._flow.ipv6_dst = [x & y for (x, y) in itertools.izip(dst, mask)]
+ self._flow.ipv6_dst = [x & y for (x, y) in zip(dst, mask)]
def set_ipv6_flabel(self, flabel):
self.set_ipv6_flabel_masked(flabel, UINT32_MAX)
diff --git a/ryu/ofproto/ofproto_v1_3_parser.py
b/ryu/ofproto/ofproto_v1_3_parser.py
index 7e3d117..f3e51c4 100644
--- a/ryu/ofproto/ofproto_v1_3_parser.py
+++ b/ryu/ofproto/ofproto_v1_3_parser.py
@@ -1436,7 +1436,7 @@ class OFPMatch(StringifyMixin):
def set_ipv6_src_masked(self, src, mask):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_SRC)
self._wc.ipv6_src_mask = mask
- self._flow.ipv6_src = [x & y for (x, y) in itertools.izip(src, mask)]
+ self._flow.ipv6_src = [x & y for (x, y) in zip(src, mask)]
def set_ipv6_dst(self, dst):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_DST)
@@ -1445,7 +1445,7 @@ class OFPMatch(StringifyMixin):
def set_ipv6_dst_masked(self, dst, mask):
self._wc.ft_set(ofproto.OFPXMT_OFB_IPV6_DST)
self._wc.ipv6_dst_mask = mask
- self._flow.ipv6_dst = [x & y for (x, y) in itertools.izip(dst, mask)]
+ self._flow.ipv6_dst = [x & y for (x, y) in zip(dst, mask)]
def set_ipv6_flabel(self, flabel):
self.set_ipv6_flabel_masked(flabel, UINT32_MAX)
diff --git a/ryu/tests/unit/ofproto/test_parser_v12.py
b/ryu/tests/unit/ofproto/test_parser_v12.py
index 891b6a8..3c6dcd6 100644
--- a/ryu/tests/unit/ofproto/test_parser_v12.py
+++ b/ryu/tests/unit/ofproto/test_parser_v12.py
@@ -7318,7 +7318,7 @@ class TestOFPMatch(unittest.TestCase):
header = ofproto.OXM_OF_IPV6_SRC_W
mask = [int(x, 16) for x in mask.split(":")]
match.set_ipv6_src_masked(ipv6, mask)
- ipv6 = [x & y for (x, y) in itertools.izip(ipv6, mask)]
+ ipv6 = [x & y for (x, y) in zip(ipv6, mask)]
self._test_serialize_and_parser(match, header, ipv6, mask)
def test_set_ipv6_src_mid(self):
@@ -7359,7 +7359,7 @@ class TestOFPMatch(unittest.TestCase):
header = ofproto.OXM_OF_IPV6_DST_W
mask = [int(x, 16) for x in mask.split(":")]
match.set_ipv6_dst_masked(ipv6, mask)
- ipv6 = [x & y for (x, y) in itertools.izip(ipv6, mask)]
+ ipv6 = [x & y for (x, y) in zip(ipv6, mask)]
self._test_serialize_and_parser(match, header, ipv6, mask)
def test_set_ipv6_dst_mid(self):
--
2.1.4
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
