idf_tools.py: fix virtualenv issue for macOS with homebrew

pull/4345/head
Ivan Grokhotkov 2019-10-30 16:19:17 +01:00
rodzic f61fd8a664
commit 9279b72a6c
1 zmienionych plików z 5 dodań i 0 usunięć

Wyświetl plik

@ -1315,6 +1315,11 @@ def main(argv):
global global_idf_tools_path
global_idf_tools_path = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(IDF_TOOLS_PATH_DEFAULT)
# On macOS, unset __PYVENV_LAUNCHER__ variable if it is set.
# Otherwise sys.executable keeps pointing to the system Python, even when a python binary from a virtualenv is invoked.
# See https://bugs.python.org/issue22490#msg283859.
os.environ.pop('__PYVENV_LAUNCER__', None)
if sys.version_info.major == 2:
try:
global_idf_tools_path.decode('ascii')