feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Use locale encoding to decode subprocess output // Resolve #2890

Browse Source
This commit is contained in:
Ivan Kravets
2019-10-30 20:43:37 +02:00
parent 7b6bab7f4e
commit 6d69c25a2f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platformio/compat.py
View File

@ -17,6 +17,7 @@
import inspect import inspect
import json import json
import locale
import os import os
import re import re
import sys import sys
@ -30,6 +31,10 @@ def get_filesystem_encoding():
return sys.getfilesystemencoding() or sys.getdefaultencoding() return sys.getfilesystemencoding() or sys.getdefaultencoding()
def get_locale_encoding():
return locale.getdefaultlocale()[1]
def get_class_attributes(cls): def get_class_attributes(cls):
attributes = inspect.getmembers(cls, lambda a: not (inspect.isroutine(a))) attributes = inspect.getmembers(cls, lambda a: not (inspect.isroutine(a)))
return { return {

11
platformio/proc.py
View File

@ -19,7 +19,12 @@ from os.path import isdir, isfile, join, normpath
from threading import Thread from threading import Thread
from platformio import exception from platformio import exception
from platformio.compat import WINDOWS, get_filesystem_encoding, string_types from platformio.compat import (
WINDOWS,
get_filesystem_encoding,
get_locale_encoding,
string_types,
)
class AsyncPipeBase(object): class AsyncPipeBase(object):
@ -122,7 +127,9 @@ def exec_command(*args, **kwargs):
for k, v in result.items(): for k, v in result.items():
if isinstance(result[k], bytes): if isinstance(result[k], bytes):
try: try:
result[k] = result[k].decode(get_filesystem_encoding()) result[k] = result[k].decode(
get_locale_encoding() or get_filesystem_encoding()
)
except UnicodeDecodeError: except UnicodeDecodeError:
result[k] = result[k].decode("latin-1") result[k] = result[k].decode("latin-1")
if v and isinstance(v, string_types): if v and isinstance(v, string_types):