summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2010-01-15 21:36:53 -0800
committerNathan Fritz <fritzy@netflint.net>2010-01-15 21:36:53 -0800
commit7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d (patch)
treeb5cb75f03b60bccb8e1c368ae13ee5aeb585f36f /sleekxmpp
parente39a2395d7d5b1490e66316cd46b3f31b787cb37 (diff)
downloadslixmpp-7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d.tar.gz
slixmpp-7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d.tar.bz2
slixmpp-7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d.tar.xz
slixmpp-7a9a86af3d2406ef921ae2d5f8ba7e42eeff973d.zip
fixed matcher bug introduced with stanza matching
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/xmlstream/matcher/xmlmask.py3
-rw-r--r--sleekxmpp/xmlstream/matcher/xpath.py3
2 files changed, 4 insertions, 2 deletions
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__'):
diff --git a/sleekxmpp/xmlstream/matcher/xpath.py b/sleekxmpp/xmlstream/matcher/xpath.py
index 5e0411ef..fe18a655 100644
--- a/sleekxmpp/xmlstream/matcher/xpath.py
+++ b/sleekxmpp/xmlstream/matcher/xpath.py
@@ -6,7 +6,8 @@ ignore_ns = False
class MatchXPath(base.MatcherBase):
def match(self, xml):
- xml = xml.xml
+ if hasattr(xml, 'xml'):
+ xml = xml.xml
x = cElementTree.Element('x')
x.append(xml)
if not ignore_ns: