pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into roster

Browse source
This commit is contained in:
Lance Stout 2011-06-20 16:27:25 -07:00
commit 774e0f2022
3 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/stanza/message.py
View file

@ -97,7 +97,7 @@ class Message(RootStanza):
clear -- Indicates if existing content should be removed clear -- Indicates if existing content should be removed
before replying. Defaults to True. before replying. Defaults to True.
""" """
StanzaBase.reply(self) StanzaBase.reply(self, clear)
if self['type'] == 'groupchat': if self['type'] == 'groupchat':
self['to'] = self['to'].bare self['to'] = self['to'].bare

13
sleekxmpp/xmlstream/xmlstream.py
View file

@ -944,13 +944,14 @@ class XMLStream(object):
func -- The event handler to execute. func -- The event handler to execute.
args -- Arguments to the event handler. args -- Arguments to the event handler.
""" """
orig = copy.copy(args[0])
try: try:
func(*args) func(*args)
except Exception as e: except Exception as e:
error_msg = 'Error processing event handler: %s' error_msg = 'Error processing event handler: %s'
log.exception(error_msg % str(func)) log.exception(error_msg % str(func))
if hasattr(args[0], 'exception'): if hasattr(orig, 'exception'):
args[0].exception(e) orig.exception(e)
def _event_runner(self): def _event_runner(self):
""" """
@ -973,6 +974,7 @@ class XMLStream(object):
etype, handler = event[0:2] etype, handler = event[0:2]
args = event[2:] args = event[2:]
orig = copy.copy(args[0])
if etype == 'stanza': if etype == 'stanza':
try: try:
@ -980,7 +982,7 @@ class XMLStream(object):
except Exception as e: except Exception as e:
error_msg = 'Error processing stream handler: %s' error_msg = 'Error processing stream handler: %s'
log.exception(error_msg % handler.name) log.exception(error_msg % handler.name)
args[0].exception(e) orig.exception(e)
elif etype == 'schedule': elif etype == 'schedule':
try: try:
log.debug('Scheduled event: %s' % args) log.debug('Scheduled event: %s' % args)
@ -989,6 +991,7 @@ class XMLStream(object):
log.exception('Error processing scheduled task') log.exception('Error processing scheduled task')
elif etype == 'event': elif etype == 'event':
func, threaded, disposable = handler func, threaded, disposable = handler
orig = copy.copy(args[0])
try: try:
if threaded: if threaded:
x = threading.Thread( x = threading.Thread(
@ -1001,8 +1004,8 @@ class XMLStream(object):
except Exception as e: except Exception as e:
error_msg = 'Error processing event handler: %s' error_msg = 'Error processing event handler: %s'
log.exception(error_msg % str(func)) log.exception(error_msg % str(func))
if hasattr(args[0], 'exception'): if hasattr(orig, 'exception'):
args[0].exception(e) orig.exception(e)
elif etype == 'quit': elif etype == 'quit':
log.debug("Quitting event runner thread") log.debug("Quitting event runner thread")
return False return False

29
tests/test_stream_exceptions.py
View file

@ -15,6 +15,35 @@ class TestStreamExceptions(SleekTest):
sys.excepthook = sys.__excepthook__ sys.excepthook = sys.__excepthook__
self.stream_close() self.stream_close()
def testExceptionReply(self):
"""Test that raising an exception replies with the original stanza."""
def message(msg):
msg.reply()
msg['body'] = 'Body changed'
raise XMPPError(clear=False)
sys.excepthook = lambda *args, **kwargs: None
self.stream_start()
self.xmpp.add_event_handler('message', message)
self.recv("""
<message>
<body>This is going to cause an error.</body>
</message>
""")
self.send("""
<message type="error">
<body>This is going to cause an error.</body>
<error type="cancel" code="500">
<undefined-condition
xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error>
</message>
""")
def testXMPPErrorException(self): def testXMPPErrorException(self):
"""Test raising an XMPPError exception.""" """Test raising an XMPPError exception."""