Changeset 70335

Timestamp:

Jan 10, 2017, 7:23:11 PM (8 years ago)

Author:

wenzeslaus

Message:

pythonlib: set fallback encoding to UTF-8 as suggested by marisn in #2885

File:

• grass/trunk/lib/python/script/utils.py (modified) (3 diffs)

grass/trunk/lib/python/script/utils.py

@@ -151 +151 @@
 
 
+def _get_encoding():
+    encoding = locale.getdefaultlocale()[1]
+    if not encoding:
+        encoding = 'UTF-8'
+    return encoding
+
+
 def decode(bytes_):
     """Decode bytes with default locale and return (unicode) string
@@ -159 +166 @@
     """
     if isinstance(bytes_, bytes):
-        enc = locale.getdefaultlocale()[1]
-        return bytes_.decode(enc) if enc else bytes_.decode()
+        enc = _get_encoding()
+        return bytes_.decode(enc)
     return bytes_
 
@@ -174 +181 @@
     if isinstance(string, bytes):
         return string
-    enc = locale.getdefaultlocale()[1]
-    return string.encode(enc) if enc else string.encode()
+    enc = _get_encoding()
+    return string.encode(enc)