diff options
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 21 | ||||
| -rw-r--r-- | sleekxmpp/test/sleektest.py | 1 |
2 files changed, 13 insertions, 9 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index e377b82f..088de4c0 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -9,7 +9,7 @@ from sleekxmpp.stanza.rootstanza import RootStanza from sleekxmpp.xmlstream import StanzaBase, ET from sleekxmpp.xmlstream.handler import Waiter, Callback -from sleekxmpp.xmlstream.matcher import MatchIDSender +from sleekxmpp.xmlstream.matcher import MatchIDSender, MatcherId from sleekxmpp.exceptions import IqTimeout, IqError @@ -194,11 +194,14 @@ class Iq(RootStanza): if timeout is None: timeout = self.stream.response_timeout - criteria = { - 'id': self['id'], - 'self': self.stream.boundjid, - 'peer': self['to'] - } + if self.stream.session_bind_event.is_set(): + matcher = MatchIDSender({ + 'id': self['id'], + 'self': self.stream.boundjid, + 'peer': self['to'] + }) + else: + matcher = MatcherId(self['id']) if callback is not None and self['type'] in ('get', 'set'): handler_name = 'IqCallback_%s' % self['id'] @@ -210,19 +213,19 @@ class Iq(RootStanza): self._fire_timeout, repeat=False) handler = Callback(handler_name, - MatchIDSender(criteria), + matcher, self._handle_result, once=True) else: handler = Callback(handler_name, - MatchIDSender(criteria), + matcher, callback, once=True) self.stream.register_handler(handler) StanzaBase.send(self, now=now) return handler_name elif block and self['type'] in ('get', 'set'): - waitfor = Waiter('IqWait_%s' % self['id'], MatchIDSender(criteria)) + waitfor = Waiter('IqWait_%s' % self['id'], matcher) self.stream.register_handler(waitfor) StanzaBase.send(self, now=now) result = waitfor.wait(timeout) diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py index 51cda3ee..d28f77e2 100644 --- a/sleekxmpp/test/sleektest.py +++ b/sleekxmpp/test/sleektest.py @@ -376,6 +376,7 @@ class SleekTest(unittest.TestCase): if skip: if socket != 'live': # Mark send queue as usable + self.xmpp.session_bind_event.set() self.xmpp.session_started_event.set() # Clear startup stanzas self.xmpp.socket.next_sent(timeout=1) |