summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2009-10-19 05:27:00 +0000
committerNathan Fritz <fritzy@netflint.net>2009-10-19 05:27:00 +0000
commite3a5211b6d7935575a9fcb292ffd8196e3def076 (patch)
tree6a65f93ba3c4ce34e6e00ef75ee6df54f229fe68 /sleekxmpp
parent14331e2c963fdc893fbe1cdbbc21e597f9d80ea4 (diff)
downloadslixmpp-e3a5211b6d7935575a9fcb292ffd8196e3def076.tar.gz
slixmpp-e3a5211b6d7935575a9fcb292ffd8196e3def076.tar.bz2
slixmpp-e3a5211b6d7935575a9fcb292ffd8196e3def076.tar.xz
slixmpp-e3a5211b6d7935575a9fcb292ffd8196e3def076.zip
* fixes
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0004.py2
-rw-r--r--sleekxmpp/xmlstream/handler/callback.py2
-rw-r--r--sleekxmpp/xmlstream/handler/waiter.py3
3 files changed, 6 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0004.py b/sleekxmpp/plugins/xep_0004.py
index cbc0a236..678b266c 100644
--- a/sleekxmpp/plugins/xep_0004.py
+++ b/sleekxmpp/plugins/xep_0004.py
@@ -100,7 +100,7 @@ class Form(FieldContainer):
form1.fromXML(self.getXML(self.type))
for field in form2.fields:
if not field.var in form1.fields:
- form1.addField(field.var, field.type, field.label, field.desc, field.required, field.value):
+ form1.addField(field.var, field.type, field.label, field.desc, field.required, field.value)
else:
form1.fields[field.var].value = field.value
for option, label in field.options:
diff --git a/sleekxmpp/xmlstream/handler/callback.py b/sleekxmpp/xmlstream/handler/callback.py
index c618b718..dd507262 100644
--- a/sleekxmpp/xmlstream/handler/callback.py
+++ b/sleekxmpp/xmlstream/handler/callback.py
@@ -1,4 +1,5 @@
from . import base
+import logging
class Callback(base.BaseHandler):
@@ -15,6 +16,7 @@ class Callback(base.BaseHandler):
self.run(payload, True)
def run(self, payload, instream=False):
+ logging.debug("Running %s in %s" % (self.name, self._pointer))
if not self._instream or instream:
base.BaseHandler.run(self, payload)
#if self._thread:
diff --git a/sleekxmpp/xmlstream/handler/waiter.py b/sleekxmpp/xmlstream/handler/waiter.py
index e62f330f..2c91052d 100644
--- a/sleekxmpp/xmlstream/handler/waiter.py
+++ b/sleekxmpp/xmlstream/handler/waiter.py
@@ -9,15 +9,18 @@ class Waiter(base.BaseHandler):
self._payload = queue.Queue()
def prerun(self, payload):
+ logging.debug("Putting into Waiter %s" % self.name)
self._payload.put(payload)
def run(self, payload):
pass
def wait(self, timeout=60):
+ logging.debug("Waiting on %s." % self.name)
try:
return self._payload.get(True, timeout)
except queue.Empty:
+ logging.warning("Timed out waiting for %s" % self.name)
return False
def checkDelete(self):