summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-04-08 16:30:52 -0400
committerLance Stout <lancestout@gmail.com>2012-04-08 16:30:52 -0400
commiteed6da538a33711f19adc70b00071af43005062a (patch)
tree2fbf8bcc7232dca2630c648dcc650234225a9caa /sleekxmpp
parentd3e8993e22c46bccea37ab06b8fbc7abf97d959a (diff)
downloadslixmpp-eed6da538a33711f19adc70b00071af43005062a.tar.gz
slixmpp-eed6da538a33711f19adc70b00071af43005062a.tar.bz2
slixmpp-eed6da538a33711f19adc70b00071af43005062a.tar.xz
slixmpp-eed6da538a33711f19adc70b00071af43005062a.zip
Undo the additional Iq result checks until further testing is done.
Revert "Check for Iq results based on both the sender's JID and the ID value." This reverts commit 9ffde5ab3706ca24b03dbea93c67810687c4b6ba.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/stanza/iq.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py
index ad801af2..47d51b04 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 StanzaPath
+from sleekxmpp.xmlstream.matcher import MatcherId
from sleekxmpp.exceptions import IqTimeout, IqError
@@ -187,17 +187,14 @@ class Iq(RootStanza):
if callback is not None and self['type'] in ('get', 'set'):
handler_name = 'IqCallback_%s' % self['id']
handler = Callback(handler_name,
- StanzaPath('iq@id=%s@from=%s' % (
- self['id'], self['to'])),
+ MatcherId(self['id']),
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'],
- StanzaPath('iq@id=%s@from=%s' % (
- self['id'], self['to'])))
+ waitfor = Waiter('IqWait_%s' % self['id'], MatcherId(self['id']))
self.stream.register_handler(waitfor)
StanzaBase.send(self, now=now)
result = waitfor.wait(timeout)