summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-01 15:19:05 -0700
committerLance Stout <lancestout@gmail.com>2011-07-01 15:19:05 -0700
commit7057984831b2a96980871476686273f8591f8101 (patch)
tree54c92d95ffb368570c041d48e45c68c1d3fe3e6d /sleekxmpp/stanza
parent774e0f2022f1ee318dc57c0008ea6cf1ddadce29 (diff)
parent2a2ac73845ffc8695e2bc55746f45e1a18d55e6c (diff)
downloadslixmpp-7057984831b2a96980871476686273f8591f8101.tar.gz
slixmpp-7057984831b2a96980871476686273f8591f8101.tar.bz2
slixmpp-7057984831b2a96980871476686273f8591f8101.tar.xz
slixmpp-7057984831b2a96980871476686273f8591f8101.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/stanza')
-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)