Merge branch '6.x-maintenance'

ehaas · Dec 6, 2017 · 92532b5 · 92532b5
2 parents 2ab7a2b + 9bd66b3
commit 92532b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -43,6 +43,9 @@ Version 6.8
 - Fix crash on Windows console, see #744.
 - Fix bashcompletion on chained commands. See #754.
 - Fix option naming routine to match documentation.  See #793
+- Fixed the behavior of click error messages with regards to unicode on 2.x
+  and 3.x respectively.  Message is now always unicode and the str and unicode
+  special methods work as you expect on that platform.
 
 Version 6.7
 -----------

diff --git a/click/exceptions.py b/click/exceptions.py
@@ -19,11 +19,14 @@ def __init__(self, message):
     def format_message(self):
         return self.message
 
-    def __unicode__(self):
+    def __str__(self):
         return self.message
 
-    def __str__(self):
-        return self.message.encode('utf-8')
+    if PY2:
+        __unicode__ = __str__
+
+        def __str__(self):
+            return self.message.encode('utf-8')
 
     def show(self, file=None):
         if file is None: