github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Lance Stout 2010-12-17 10:44:32 -05:00
commit 506eccf84d
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sleekxmpp/stanza/rootstanza.py
View file

@ -54,16 +54,17 @@ class RootStanza(StanzaBase):
e.extension_args) e.extension_args)
self['error'].append(extxml) self['error'].append(extxml)
self['error']['type'] = e.etype self['error']['type'] = e.etype
self.send()
else: else:
# We probably didn't raise this on purpose, so send a traceback # We probably didn't raise this on purpose, so send an error stanza
self['error']['condition'] = 'undefined-condition' self['error']['condition'] = 'undefined-condition'
if sys.version_info < (3, 0): self['error']['text'] = "SleekXMPP got into trouble."
self['error']['text'] = "SleekXMPP got into trouble." self.send()
else: # log the error
self['error']['text'] = traceback.format_tb(e.__traceback__) log.exception('Error handling {%s}%s stanza' %
log.exception('Error handling {%s}%s stanza' % (self.namespace, self.name))
(self.namespace, self.name)) # Finally raise the exception, so it can be handled (or not)
self.send() # at a higher level
raise e
register_stanza_plugin(RootStanza, Error) register_stanza_plugin(RootStanza, Error)