jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Iq.send: set the timeout even when no timeout_callback is set

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2015-03-03 16:05:47 +01:00
parent 632b7b4afe
commit b6b0e82dec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slixmpp/stanza/iq.py
View File

@ -152,7 +152,7 @@ class Iq(RootStanza):
new_iq['type'] = 'result' new_iq['type'] = 'result'
return new_iq return new_iq
def send(self, callback=None, timeout=None, timeout_callback=None, coroutine=False): def send(self, callback=None, timeout=None, timeout_callback=None):
"""Send an <iq> stanza over the XML stream. """Send an <iq> stanza over the XML stream.
A callback handler can be provided that will be executed when the Iq A callback handler can be provided that will be executed when the Iq
@ -193,7 +193,7 @@ class Iq(RootStanza):
else: else:
future.set_result(result) future.set_result(result)
if timeout_callback is not None and timeout is not None: if timeout is not None:
self.stream.cancel_schedule('IqTimeout_%s' % self['id']) self.stream.cancel_schedule('IqTimeout_%s' % self['id'])
if callback is not None: if callback is not None:
callback(result) callback(result)
@ -210,7 +210,7 @@ class Iq(RootStanza):
constr = CoroutineCallback constr = CoroutineCallback
else: else:
constr = Callback constr = Callback
if timeout_callback is not None and timeout is not None: if timeout is not None:
self.stream.schedule('IqTimeout_%s' % self['id'], self.stream.schedule('IqTimeout_%s' % self['id'],
timeout, timeout,
callback_timeout, callback_timeout,