From a42f75700ae3fdc9034279f8dd28ddfa387a3376 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Wed, 1 Dec 2010 15:22:47 +0100 Subject: [PATCH] fix unicode issues --- weboob/applications/monboob/monboob.py | 6 +++--- weboob/tools/misc.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/weboob/applications/monboob/monboob.py b/weboob/applications/monboob/monboob.py index 14628a7f..90700d86 100644 --- a/weboob/applications/monboob/monboob.py +++ b/weboob/applications/monboob/monboob.py @@ -33,7 +33,7 @@ from weboob.core import Weboob, CallErrors from weboob.core.scheduler import Scheduler from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Thread, Message from weboob.tools.application.repl import ReplApplication -from weboob.tools.misc import html2text, get_backtrace, utc2local +from weboob.tools.misc import html2text, get_backtrace, utc2local, to_unicode __all__ = ['Monboob'] @@ -196,9 +196,9 @@ class Monboob(ReplApplication): backend.post_message(message) except Exception, e: content = u'Unable to send message to %s:\n' % thread_id - content += u'\n\t%s\n' % e + content += u'\n\t%s\n' % to_unicode(e) if logging.root.level == logging.DEBUG: - content += u'\n%s\n' % get_backtrace(e) + content += u'\n%s\n' % to_unicode(get_backtrace(e)) self.send_email(backend, Message(thread, 0, title='Unable to send message', diff --git a/weboob/tools/misc.py b/weboob/tools/misc.py index 875f84a6..1d57f4ac 100644 --- a/weboob/tools/misc.py +++ b/weboob/tools/misc.py @@ -38,7 +38,10 @@ def to_unicode(text): if isinstance(text, unicode): return text if not isinstance(text, str): - text = str(text) + try: + text = str(text) + except UnicodeError: + return unicode(text) try: return unicode(text, "utf8") except UnicodeError: