Better Unicode handling in errors.

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 8a69d00..616e351 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -12,11 +12,16 @@ import shutil
 class UnicodeException(Exception):
     def __str__(self):
         """ Dirty workaround for Python Unicode handling problems. """
 class UnicodeException(Exception):
     def __str__(self):
         """ Dirty workaround for Python Unicode handling problems. """

-        return self.message
+        return unicode(self).encode('utf-8')

 
     def __unicode__(self):
         """ Dirty workaround for Python Unicode handling problems. """
 
     def __unicode__(self):
         """ Dirty workaround for Python Unicode handling problems. """

-        return self.message
+        args = self.args[0] if len(self.args) == 1 else self.args
+        try:
+            message = unicode(args)
+        except UnicodeDecodeError:
+            message = unicode(args, encoding='utf-8', errors='ignore')
+        return message

 
 class ParseError(UnicodeException):
     pass
 
 class ParseError(UnicodeException):
     pass