Merge branch '0.10' into 0.11 (pull request gh-1868)

7 years ago · 9dc9477e71
parent eca63ab32a 8e6b4346dc
commit 9dc9477e71
1 changed files with 4 additions and 0 deletions
--- a/fail2ban/helpers.py
+++ b/fail2ban/helpers.py
@ -34,6 +34,10 @@ from .server.mytime import MyTime


 PREFER_ENC = locale.getpreferredencoding()
+# correct prefered encoding if lang not set in environment:
+if PREFER_ENC.startswith('ANSI_'): # pragma: no cover
+	if all((os.getenv(v) in (None, "") for v in ('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'))):
+		PREFER_ENC = 'UTF-8';


 def formatExceptionInfo():