summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-05-31 03:36:25 -0700
committerNathan Fritz <nathan@andyet.net>2010-05-31 03:36:25 -0700
commit82a3918aa475dbd4abc8941b8c5601f61ab2e508 (patch)
tree4c6658ef2df5e48c66501fc75d10bede059ec43c
parentcff3079a04f9f12da5530c68d385d0c0f03af69e (diff)
downloadslixmpp-82a3918aa475dbd4abc8941b8c5601f61ab2e508.tar.gz
slixmpp-82a3918aa475dbd4abc8941b8c5601f61ab2e508.tar.bz2
slixmpp-82a3918aa475dbd4abc8941b8c5601f61ab2e508.tar.xz
slixmpp-82a3918aa475dbd4abc8941b8c5601f61ab2e508.zip
Scheduler waits too longer, and pubsubstate registration was backwards
-rw-r--r--sleekxmpp/plugins/stanza_pubsub.py4
-rw-r--r--sleekxmpp/xmlstream/scheduler.py2
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py3
3 files changed, 6 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py
index 0a75e1e7..1a1526f0 100644
--- a/sleekxmpp/plugins/stanza_pubsub.py
+++ b/sleekxmpp/plugins/stanza_pubsub.py
@@ -40,8 +40,8 @@ class PubsubStateEvent(ElementBase):
plugin_attrib_map = {}
plugin_tag_map = {}
-stanzaPlugin(Message, PubsubState)
-stanzaPlugin(PubsubState, PubsubStateEvent)
+stanzaPlugin(Message, PubsubStateEvent)
+stanzaPlugin(PubsubStateEvent, PubsubState)
class Pubsub(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub'
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index 18d9229e..945d9fad 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -49,7 +49,7 @@ class Scheduler(object):
self.run = True
while self.run:
try:
- wait = 5
+ wait = 1
updated = False
if self.schedule:
wait = self.schedule[0].next - time.time()
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index c40922be..64020c8f 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -78,6 +78,9 @@ class ElementBase(tostring.ToString):
def __iter__(self):
self.idx = 0
return self
+
+ def __bool__(self):
+ return True
def __next__(self):
self.idx += 1