Fixed locale detection error

This commit is contained in:
aviau 2016-01-26 09:34:25 -05:00
parent 5ff8c3115b
commit d7e0c66297
3 changed files with 29 additions and 0 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
python-click (6.2-2) unstable; urgency=medium
* Fixed locale detection error (Closes: #812713)
-- Alexandre Viau <aviau@debian.org> Tue, 26 Jan 2016 09:33:30 -0500
python-click (6.2-1) unstable; urgency=medium
* New upstream release

22
debian/patches/fix-locale-check.patch vendored Normal file
View file

@ -0,0 +1,22 @@
Description: fixed locale detection error
Origin: vendor
Bug: 812713
Author: Alexandre Viau <aviau@debian.org>
Reviewed-by: Alexandre Viau <aviau@debian.org>
Last-Update: 2016-01-26
Applied-Upstream: https://github.com/mitsuhiko/click/commit/6bc3bf977a16d948841de17a6993ee11587b75b1
--- a/click/_unicodefun.py
+++ b/click/_unicodefun.py
@@ -64,6 +64,11 @@
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')):

1
debian/patches/series vendored Normal file
View file

@ -0,0 +1 @@
fix-locale-check.patch