From e39a2395d7d5b1490e66316cd46b3f31b787cb37 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Fri, 15 Jan 2010 21:07:28 -0800 Subject: xep 30 and 50 always reply from jid iq sent to --- sleekxmpp/xmlstream/matcher/xmlmask.py | 1 + 1 file changed, 1 insertion(+) (limited to 'sleekxmpp/xmlstream/matcher/xmlmask.py') diff --git a/sleekxmpp/xmlstream/matcher/xmlmask.py b/sleekxmpp/xmlstream/matcher/xmlmask.py index e8e4df02..1cd19644 100644 --- a/sleekxmpp/xmlstream/matcher/xmlmask.py +++ b/sleekxmpp/xmlstream/matcher/xmlmask.py @@ -16,6 +16,7 @@ class MatchXMLMask(base.MatcherBase): self.default_ns = ns def match(self, xml): + xml = xml.xml return self.maskcmp(xml, self._criteria, True) def maskcmp(self, source, maskobj, use_ns=False, default_ns='__no_ns__'): -- cgit v1.2.3 From 7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Fri, 15 Jan 2010 21:36:53 -0800 Subject: fixed matcher bug introduced with stanza matching --- sleekxmpp/xmlstream/matcher/xmlmask.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sleekxmpp/xmlstream/matcher/xmlmask.py') diff --git a/sleekxmpp/xmlstream/matcher/xmlmask.py b/sleekxmpp/xmlstream/matcher/xmlmask.py index 1cd19644..e4a22faa 100644 --- a/sleekxmpp/xmlstream/matcher/xmlmask.py +++ b/sleekxmpp/xmlstream/matcher/xmlmask.py @@ -16,7 +16,8 @@ class MatchXMLMask(base.MatcherBase): self.default_ns = ns def match(self, xml): - xml = xml.xml + if hasattr(xml, 'xml'): + xml = xml.xml return self.maskcmp(xml, self._criteria, True) def maskcmp(self, source, maskobj, use_ns=False, default_ns='__no_ns__'): -- cgit v1.2.3