summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-17 15:13:09 -0500
committerLance Stout <lancestout@gmail.com>2010-11-17 15:13:09 -0500
commit6ee8a2980c2a7c9a8c65453b1d2c551717069ce5 (patch)
tree2721ea1d493ecb9d1d8ab40098403b60b3f02f7f /sleekxmpp/stanza
parentb8114b25ed28437248322aad50209f737faa392c (diff)
downloadslixmpp-6ee8a2980c2a7c9a8c65453b1d2c551717069ce5.tar.gz
slixmpp-6ee8a2980c2a7c9a8c65453b1d2c551717069ce5.tar.bz2
slixmpp-6ee8a2980c2a7c9a8c65453b1d2c551717069ce5.tar.xz
slixmpp-6ee8a2980c2a7c9a8c65453b1d2c551717069ce5.zip
Fix RESPONSE_TIMEOUT dependency loops.
Diffstat (limited to 'sleekxmpp/stanza')
-rw-r--r--sleekxmpp/stanza/iq.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py
index 614d14f5..150baa00 100644
--- a/sleekxmpp/stanza/iq.py
+++ b/sleekxmpp/stanza/iq.py
@@ -8,7 +8,7 @@
from sleekxmpp.stanza import Error
from sleekxmpp.stanza.rootstanza import RootStanza
-from sleekxmpp.xmlstream import RESPONSE_TIMEOUT, StanzaBase, ET
+from sleekxmpp.xmlstream import StanzaBase, ET
from sleekxmpp.xmlstream.handler import Waiter
from sleekxmpp.xmlstream.matcher import MatcherId
@@ -157,7 +157,7 @@ class Iq(RootStanza):
StanzaBase.reply(self)
return self
- def send(self, block=True, timeout=RESPONSE_TIMEOUT):
+ def send(self, block=True, timeout=None):
"""
Send an <iq> stanza over the XML stream.
@@ -174,6 +174,8 @@ class Iq(RootStanza):
before exiting the send call if blocking is used.
Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
"""
+ if timeout is None:
+ timeout = self.stream.response_timeout
if block and self['type'] in ('get', 'set'):
waitfor = Waiter('IqWait_%s' % self['id'], MatcherId(self['id']))
self.stream.registerHandler(waitfor)