summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
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/xmlstream
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/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py29
1 files changed, 7 insertions, 22 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 6282c8d0..c7d0d3a8 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -764,7 +764,6 @@ class XMLStream(object):
Event handlers and the send queue will be threaded
regardless of this parameter's value.
"""
- self._thread_excepthook()
self.scheduler.process(threaded=True)
def start_thread(name, target):
@@ -1052,30 +1051,16 @@ class XMLStream(object):
self.event_queue.put(('quit', None, None))
return
- def _thread_excepthook(self):
+ def exception(self, exception):
"""
- If a threaded event handler raises an exception, there is no way to
- catch it except with an excepthook. Currently, each thread has its own
- excepthook, but ideally we could use the main sys.excepthook.
+ Process an unknown exception.
- Modifies threading.Thread to use sys.excepthook when an exception
- is not caught.
- """
- init_old = threading.Thread.__init__
-
- def init(self, *args, **kwargs):
- init_old(self, *args, **kwargs)
- run_old = self.run
+ Meant to be overridden.
- def run_with_except_hook(*args, **kw):
- try:
- run_old(*args, **kw)
- except (KeyboardInterrupt, SystemExit):
- raise
- except:
- sys.excepthook(*sys.exc_info())
- self.run = run_with_except_hook
- threading.Thread.__init__ = init
+ Arguments:
+ exception -- An unhandled exception object.
+ """
+ pass
# To comply with PEP8, method names now use underscores.