From 602a6d8491171de5cccb332684813e71f5d33c43 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Thu, 22 Apr 2010 21:24:28 -0700 Subject: bugfixes and continuing to work on pubsub tests --- sleekxmpp/stanza/rootstanza.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sleekxmpp/stanza/rootstanza.py') diff --git a/sleekxmpp/stanza/rootstanza.py b/sleekxmpp/stanza/rootstanza.py index 9c147e40..3b4822d8 100644 --- a/sleekxmpp/stanza/rootstanza.py +++ b/sleekxmpp/stanza/rootstanza.py @@ -10,6 +10,7 @@ from xml.etree import cElementTree as ET from . error import Error from .. exceptions import XMPPError import traceback +import sys class RootStanza(StanzaBase): @@ -24,7 +25,10 @@ class RootStanza(StanzaBase): self['error']['type'] = e.etype else: # we probably didn't raise this on purpose, so send back a traceback self['error']['condition'] = 'undefined-condition' - self['error']['text'] = traceback.format_tb(e.__traceback__) + if sys.version_info < (3,0): + self['error']['text'] = "SleekXMPP got into trouble." + else: + self['error']['text'] = traceback.format_tb(e.__traceback__) self.send() # all jabber:client root stanzas should have the error plugin -- cgit v1.2.3