summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-05-31 18:36:25 +0800
committerThom Nichols <tmnichols@gmail.com>2010-06-01 22:07:53 +0800
commitecf902bf16abbcfab0243d4ecd6e7d41967b121a (patch)
tree518141f4d3d8341edf5d8fbdea9a2d21a5b0aeb0 /sleekxmpp/xmlstream
parentd76c0931ef3ee8fe2cb5fc286bf8974e34f1e406 (diff)
downloadslixmpp-ecf902bf16abbcfab0243d4ecd6e7d41967b121a.tar.gz
slixmpp-ecf902bf16abbcfab0243d4ecd6e7d41967b121a.tar.bz2
slixmpp-ecf902bf16abbcfab0243d4ecd6e7d41967b121a.tar.xz
slixmpp-ecf902bf16abbcfab0243d4ecd6e7d41967b121a.zip
Scheduler waits too longer, and pubsubstate registration was backwards
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/scheduler.py2
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py3
2 files changed, 4 insertions, 1 deletions
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