Merge branch 'bugfix/kconfiglib_open_encoding_v4.0' into 'release/v4.0'

tools: Avoid Unicode error in kconfiglib while opening files

See merge request espressif/esp-idf!8082
This commit is contained in:
Angus Gratton 2020-03-31 11:52:16 +08:00
commit 0b822a9ec7

View file

@ -1125,7 +1125,7 @@ class Kconfig(object):
was set when the configuration was loaded. was set when the configuration was loaded.
""" """
try: try:
return open(filename) return open(filename) if sys.version_info[0] < 3 else open(filename, encoding='utf-8')
except IOError as e: except IOError as e:
if not os.path.isabs(filename) and self.srctree is not None: if not os.path.isabs(filename) and self.srctree is not None:
filename = os.path.join(self.srctree, filename) filename = os.path.join(self.srctree, filename)