aboutsummaryrefslogtreecommitdiffstats
path: root/sleekxmpp/xmlstream/matcher
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2010-11-23 22:52:48 -0500
committerGuillaume Horel <guillaume.horel@gmail.com>2010-11-23 22:52:48 -0500
commit217835b3adddedc9e8c501e8868d0440509ba1d5 (patch)
tree87ca06cceaf5af8a6d18fb57b65143cb784fb123 /sleekxmpp/xmlstream/matcher
parenta5b4d8b2d4cda356afddcdab4864d27e165237f7 (diff)
downloadalias-217835b3adddedc9e8c501e8868d0440509ba1d5.tar.gz
Update to latest version of sleekxmpp
this fixes the bug with service discovery
Diffstat (limited to 'sleekxmpp/xmlstream/matcher')
-rw-r--r--sleekxmpp/xmlstream/matcher/xmlmask.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/matcher/xmlmask.py b/sleekxmpp/xmlstream/matcher/xmlmask.py
index 2967a2a..6ebb437 100644
--- a/sleekxmpp/xmlstream/matcher/xmlmask.py
+++ b/sleekxmpp/xmlstream/matcher/xmlmask.py
@@ -6,6 +6,8 @@
See the file LICENSE for copying permission.
"""
+import logging
+
from xml.parsers.expat import ExpatError
from sleekxmpp.xmlstream.stanzabase import ET
@@ -18,6 +20,9 @@ from sleekxmpp.xmlstream.matcher.base import MatcherBase
IGNORE_NS = False
+log = logging.getLogger(__name__)
+
+
class MatchXMLMask(MatcherBase):
"""
@@ -97,8 +102,7 @@ class MatchXMLMask(MatcherBase):
try:
mask = ET.fromstring(mask)
except ExpatError:
- logging.log(logging.WARNING,
- "Expat error: %s\nIn parsing: %s" % ('', mask))
+ log.warning("Expat error: %s\nIn parsing: %s" % ('', mask))
if not use_ns:
# Compare the element without using namespaces.