From ed4452b115daec022d45d532ac526bf35cba3f0b Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 14 Feb 2020 17:09:48 +0200 Subject: [PATCH] Get rid of direct imports --- .../ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl index f8911d2d..6e61501e 100644 --- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl +++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl @@ -4,8 +4,8 @@ "name": "!!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags" }, { +% import os % import platform -% from os.path import commonprefix, dirname, isabs, isdir, isfile, join % % systype = platform.system().lower() % @@ -19,8 +19,8 @@ % % def _find_abs_path(inc, inc_paths): % for path in inc_paths: -% if isfile(join(path, inc)): -% return join(path, inc) +% if os.path.isfile(os.path.join(path, inc)): +% return os.path.join(path, inc) % end % end % return inc @@ -35,7 +35,7 @@ % i = i + 1 % if i < length and not flags[i].startswith("-"): % inc = flags[i] -% if not isabs(inc): +% if not os.path.isabs(inc): % inc = _find_abs_path(inc, inc_paths) % end % result.append(to_unix_path(inc)) @@ -73,7 +73,8 @@ % % cleaned_includes = [] % for include in includes: -% if "toolchain-" not in dirname(commonprefix([include, cc_path])) and isdir(include): +% if "toolchain-" not in os.path.dirname(os.path.commonprefix( +% [include, cc_path])) and os.path.isdir(include): % cleaned_includes.append(include) % end % end