Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/idfpy_cmake_cache_encoding' into 'master'

Browse source 
idf.py: add encoding option

Closes IDFGH-1905

See merge request espressif/esp-idf!6589
This commit is contained in:
Angus Gratton 2019-11-26 11:50:15 +08:00
commit 649f27c620
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/idf_py_actions/tools.py
View file

@ -2,6 +2,7 @@ import os
import re import re
import subprocess import subprocess
import sys import sys
from io import open
from .constants import GENERATORS from .constants import GENERATORS
from .errors import FatalError from .errors import FatalError
@ -96,7 +97,7 @@ def _parse_cmakecache(path):
CMakeCache entries also each have a "type", but this is currently ignored. CMakeCache entries also each have a "type", but this is currently ignored.
""" """
result = {} result = {}
with open(path) as f: with open(path, encoding='utf-8') as f:
for line in f: for line in f:
# cmake cache lines look like: CMAKE_CXX_FLAGS_DEBUG:STRING=-g # cmake cache lines look like: CMAKE_CXX_FLAGS_DEBUG:STRING=-g
# groups are name, type, value # groups are name, type, value