Workaround for unicode messages in Exception instances with Python < 2.6.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7007 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 11 insertions, 1 deletions

diff --git a/docutils/__init__.py b/docutils/__init__.py
index b37b0d1ed..5305720a6 100644
--- a/docutils/__init__.py
+++ b/docutils/__init__.py
@@ -60,7 +60,17 @@ __version_details__ = 'repository'
 """Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
 'release'), modified automatically & manually."""
 
-class ApplicationError(StandardError): pass
+import sys
+
+class ApplicationError(StandardError):
+    # Workaround:
+    # In Python < 2.6, unicode(<exception instance>) calls `str` on the
+    # arg and therefore, e.g., unicode(StandardError(u'\u234')) fails
+    # with UnicodeDecodeError.
+    if sys.version_info < (2,6):
+        def __unicode__(self):
+            return u', '.join(self.args)
+
 class DataError(ApplicationError): pass