From afcdb5f123f0c9980ba298885a992f334f50e0c5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 22 Nov 2013 13:41:31 +0900 Subject: [PATCH] Packet: fix iterator replace Packet.__iter__ which doesn't work in cases like nested iterations. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/lib/packet/packet.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ryu/lib/packet/packet.py b/ryu/lib/packet/packet.py index 0661e9b2..2042dd7c 100644 --- a/ryu/lib/packet/packet.py +++ b/ryu/lib/packet/packet.py @@ -41,7 +41,6 @@ class Packet(object): self.protocols = [] else: self.protocols = protocols - self.protocol_idx = 0 if self.data: self._parser(parse_cls) @@ -106,22 +105,12 @@ class Packet(object): return result[0] return None - def next(self): - try: - p = self.protocols[self.protocol_idx] - except: - self.protocol_idx = 0 - raise StopIteration - - self.protocol_idx += 1 - return p - def __div__(self, trailer): self.add_protocol(trailer) return self def __iter__(self): - return self + return iter(self.protocols) def __getitem__(self, idx): return self.protocols[idx]