Merge branch 'develop-1.1' of github.com:fritzy/SleekXMPP into develop-1.1

This commit is contained in:
Lance Stout
2011-12-15 12:04:14 -08:00
2 changed files with 91 additions and 2 deletions

View File

@@ -1276,8 +1276,6 @@ class XMLStream(object):
:param xml: The :class:`~sleekxmpp.xmlstream.stanzabase.ElementBase`
stanza to analyze.
"""
log.debug("RECV: %s", tostring(xml, xmlns=self.default_ns,
stream=self))
# Apply any preprocessing filters.
xml = self.incoming_filter(xml)
@@ -1291,6 +1289,9 @@ class XMLStream(object):
if stanza is None:
return
log.debug("RECV: %s", tostring(xml, xmlns=self.default_ns,
stream=self))
# Match the stanza against registered handlers. Handlers marked
# to run "in stream" will be executed immediately; the rest will
# be queued.