From 602a6d8491171de5cccb332684813e71f5d33c43 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Thu, 22 Apr 2010 21:24:28 -0700 Subject: bugfixes and continuing to work on pubsub tests --- sleekxmpp/xmlstream/stanzabase.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sleekxmpp/xmlstream/stanzabase.py') diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index ae9e9df7..57c727a3 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -77,11 +77,14 @@ class ElementBase(tostring.ToString): def __next__(self): self.idx += 1 - if self.idx + 1 > len(self.iterables): + if self.idx > len(self.iterables): self.idx = 0 raise StopIteration - return self.affiliations[self.idx] + return self.iterables[self.idx - 1] + def next(self): + return self.__next__() + def __len__(self): return len(self.iterables) @@ -140,6 +143,9 @@ class ElementBase(tostring.ToString): def find(self, xpath): # for backwards compatiblity, expose elementtree interface return self.xml.find(xpath) + + def findall(self, xpath): + return self.xml.findall(xpath) def setup(self, xml=None): if self.xml is None: -- cgit v1.2.3