Store unicode strings properly in exceptions

mitsuhiko · mitsuhiko · commit 8c6c1505adf8 · 2015-12-18T13:32:30.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -8,6 +8,8 @@ Version 7.0
 
 (upcoming release with new features, release date to be decided)
 
+- The exception objects now store unicode properly.
+
 Version 6.3
 -----------
 
diff --git a/click/exceptions.py b/click/exceptions.py
@@ -9,15 +9,22 @@ class ClickException(Exception):
     exit_code = 1
 
     def __init__(self, message):
+        ctor_msg = message
         if PY2:
-            if message is not None:
-                message = message.encode('utf-8')
-        Exception.__init__(self, message)
+            if ctor_msg is not None:
+                ctor_msg = ctor_msg.encode('utf-8')
+        Exception.__init__(self, ctor_msg)
         self.message = message
 
     def format_message(self):
         return self.message
 
+    def __unicode__(self):
+        return self.message
+
+    def __str__(self):
+        return self.message.encode('utf-8')
+
     def show(self, file=None):
         if file is None:
             file = get_text_stderr()
