Merge branch '6.x-maintenance'

ehaas · Dec 30, 2015 · 5aeff2d · 5aeff2d
2 parents 8c6c150 + 6bc3bf9
commit 5aeff2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -17,6 +17,7 @@ Version 6.3
 
 - Fix argument checks for interpreter invoke with `-m` and `-c`
   on Windows.
+- Fixed a bug that cased locale detection to error out on Python 3.
 
 Version 6.2
 -----------

diff --git a/click/_unicodefun.py b/click/_unicodefun.py
@@ -64,6 +64,11 @@ def _verify_python3_env():
                               stderr=subprocess.PIPE).communicate()[0]
         good_locales = set()
         has_c_utf8 = False
+
+        # Make sure we're operating on text here.
+        if isinstance(rv, bytes):
+            rv = rv.decode('ascii', 'replace')
+
         for line in rv.splitlines():
             locale = line.strip()
             if locale.lower().endswith(('.utf-8', '.utf8')):