platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Decode subprocess output only for byte-strings

Browse Source
This commit is contained in:
Ivan Kravets
2020-12-02 15:15:17 +02:00
parent 75b3846f8f
commit 3469905365
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platformio/proc.py
View File

@ -20,6 +20,7 @@ from threading import Thread
from platformio import exception from platformio import exception
from platformio.compat import ( from platformio.compat import (
PY2,
WINDOWS, WINDOWS,
get_filesystem_encoding, get_filesystem_encoding,
get_locale_encoding, get_locale_encoding,
@ -125,7 +126,9 @@ def exec_command(*args, **kwargs):
result[s[3:]] = kwargs[s].get_buffer() result[s[3:]] = kwargs[s].get_buffer()
for k, v in result.items(): for k, v in result.items():
if isinstance(result[k], bytes): if PY2 and isinstance(v, unicode): # pylint: disable=undefined-variable
result[k] = v.encode()
elif not PY2 and isinstance(result[k], bytes):
try: try:
result[k] = result[k].decode( result[k] = result[k].decode(
get_locale_encoding() or get_filesystem_encoding() get_locale_encoding() or get_filesystem_encoding()