summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza/rootstanza.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-03 00:39:14 -0700
committerLance Stout <lancestout@gmail.com>2011-07-03 00:39:14 -0700
commit20df6348a4c8262a40578d84c934f9a15431d925 (patch)
treec6dc62a271c0125bf623a2376cc64c08e00ae7ad /sleekxmpp/stanza/rootstanza.py
parent847510c6b577f889cdba5deaa0bb271475cc7c7f (diff)
parent086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff)
downloadslixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.gz
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.bz2
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.xz
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/stanza/rootstanza.py')
-rw-r--r--sleekxmpp/stanza/rootstanza.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/sleekxmpp/stanza/rootstanza.py b/sleekxmpp/stanza/rootstanza.py
index bc11476e..9e1d1cfa 100644
--- a/sleekxmpp/stanza/rootstanza.py
+++ b/sleekxmpp/stanza/rootstanza.py
@@ -64,8 +64,7 @@ class RootStanza(StanzaBase):
# log the error
log.exception('Error handling {%s}%s stanza' %
(self.namespace, self.name))
- # Finally raise the exception, so it can be handled (or not)
- # at a higher level by using sys.excepthook.
- raise e
+ # Finally raise the exception to a global exception handler
+ self.stream.exception(e)
register_stanza_plugin(RootStanza, Error)