diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-04-19 01:03:27 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-04-19 01:03:27 -0700 |
| commit | 212660091f155255ee9f45cdfca7969d8313309c (patch) | |
| tree | d796fe3a72f834f06fda39a4b5d784eea7e3ec5c /sleekxmpp | |
| parent | 35c157f9d8c9bb2f59d17ec68b771ffcffb7931d (diff) | |
| download | slixmpp-212660091f155255ee9f45cdfca7969d8313309c.tar.gz slixmpp-212660091f155255ee9f45cdfca7969d8313309c.tar.bz2 slixmpp-212660091f155255ee9f45cdfca7969d8313309c.tar.xz slixmpp-212660091f155255ee9f45cdfca7969d8313309c.zip | |
added pubsub tests and fixed match on iterator error
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/plugins/stanza_pubsub.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/stanzabase.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py index 1d8c86f2..d25c2b3a 100644 --- a/sleekxmpp/plugins/stanza_pubsub.py +++ b/sleekxmpp/plugins/stanza_pubsub.py @@ -2,6 +2,7 @@ from .. xmlstream.stanzabase import ElementBase, ET, JID from .. stanza.iq import Iq from .. basexmpp import basexmpp from .. xmlstream.xmlstream import XMLStream +import logging from . import xep_0004 def stanzaPlugin(stanza, plugin): @@ -283,7 +284,6 @@ class Configure(ElementBase): self.xml.remove(config) stanzaPlugin(Pubsub, Configure) -stanzaPlugin(Create, Configure) class DefaultConfig(ElementBase): namespace = 'http://jabber.org/protocol/pubsub#owner' diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index 6ed5cbd0..f72aa6e2 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -120,6 +120,8 @@ class ElementBase(tostring.ToString): if tagargs[0] not in (self.plugins, self.plugin_attrib): return False founditerable = False for iterable in self.iterables: + if nodes[1:] == []: + break founditerable = iterable.match(nodes[1:]) if founditerable: break; for evals in tagargs[1:]: |