Merge branch 'ss/remove-stringio-in-threadutil' into next

This commit is contained in:
Nicolas Sebrecht 2011-03-11 20:34:56 +01:00
commit 6887bd995d

View File

@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from threading import * from threading import *
from StringIO import StringIO
from Queue import Queue, Empty from Queue import Queue, Empty
import sys, traceback, thread, time import sys, traceback, thread, time
from offlineimap.ui import getglobalui from offlineimap.ui import getglobalui
@ -173,9 +172,8 @@ class ExitNotifyThread(Thread):
self.setExitCause('EXCEPTION') self.setExitCause('EXCEPTION')
if sys: if sys:
self.setExitException(sys.exc_info()[1]) self.setExitException(sys.exc_info()[1])
sbuf = StringIO() tb = traceback.format_exc()
traceback.print_exc(file = sbuf) self.setExitStackTrace(tb)
self.setExitStackTrace(sbuf.getvalue())
else: else:
self.setExitCause('NORMAL') self.setExitCause('NORMAL')
if not hasattr(self, 'exitmessage'): if not hasattr(self, 'exitmessage'):