github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-30 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixes

Browse source
This commit is contained in:
Nathan Fritz 2009-10-19 05:27:00 +00:00
parent 14331e2c96
commit e3a5211b6d
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/plugins/xep_0004.py
View file

@ -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:

2
sleekxmpp/xmlstream/handler/callback.py
View file

@ -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:

3
sleekxmpp/xmlstream/handler/waiter.py
View file

@ -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):