Merge branch 'bugfix/menuconfig_py3' into 'master'

tools: Fix menuconfig for Python 3

See merge request espressif/esp-idf!6991
This commit is contained in:
Angus Gratton
2019-12-16 12:59:34 +08:00

View File

@@ -35,9 +35,11 @@ def action_extensions(base_actions, project_path):
Menuconfig target is build_target extended with the style argument for setting the value for the environment Menuconfig target is build_target extended with the style argument for setting the value for the environment
variable. variable.
""" """
# The subprocess lib cannot accept environment variables as "unicode" . This is a problem if sys.version_info[0] < 3:
# only in Python 2. # The subprocess lib cannot accept environment variables as "unicode".
os.environ['MENUCONFIG_STYLE'] = style.encode(sys.getfilesystemencoding() or 'utf-8') # This encoding step is required only in Python 2.
style = style.encode(sys.getfilesystemencoding() or 'utf-8')
os.environ['MENUCONFIG_STYLE'] = style
build_target(target_name, ctx, args) build_target(target_name, ctx, args)
def fallback_target(target_name, ctx, args): def fallback_target(target_name, ctx, args):