diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index f20b6b08..01cd4f2f 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -57,10 +57,9 @@ class LibBuilderFactory(object): @staticmethod def get_used_frameworks(env, path): - if any([ + if any( isfile(join(path, fname)) - for fname in ("library.properties", "keywords.txt") - ]): + for fname in ("library.properties", "keywords.txt")): return ["arduino"] if isfile(join(path, "module.json")): @@ -156,7 +155,7 @@ class LibBuilderBase(object): @property def include_dir(self): - if not all([isdir(join(self.path, d)) for d in ("include", "src")]): + if not all(isdir(join(self.path, d)) for d in ("include", "src")): return None return join(self.path, "include") diff --git a/platformio/builder/tools/pioupload.py b/platformio/builder/tools/pioupload.py index ab7b27ca..f867c78a 100644 --- a/platformio/builder/tools/pioupload.py +++ b/platformio/builder/tools/pioupload.py @@ -114,10 +114,10 @@ def AutodetectUploadPort(*args, **kwargs): # pylint: disable=unused-argument mbed_pages = [ join(item['path'], n) for n in ("mbed.htm", "mbed.html") ] - if any([isfile(p) for p in mbed_pages]): + if any(isfile(p) for p in mbed_pages): return item['path'] if item['name'] \ - and any([l in item['name'].lower() for l in msdlabels]): + and any(l in item['name'].lower() for l in msdlabels): return item['path'] return None diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index f9dd5386..0ca092de 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -68,7 +68,7 @@ def BuildProgram(env): # append specified LD_SCRIPT if ("LDSCRIPT_PATH" in env - and not any(["-Wl,-T" in f for f in env['LINKFLAGS']])): + and not any("-Wl,-T" in f for f in env['LINKFLAGS'])): env.Append(LINKFLAGS=['-Wl,-T"$LDSCRIPT_PATH"']) # enable "cyclic reference" for linker diff --git a/platformio/commands/run.py b/platformio/commands/run.py index f75a07c9..d459ae6d 100644 --- a/platformio/commands/run.py +++ b/platformio/commands/run.py @@ -111,7 +111,7 @@ def cli(ctx, environment, target, upload_port, project_dir, silent, verbose, "nobuild" not in ep.get_build_targets(): ctx.invoke(cmd_device_monitor) - found_error = any([status is False for (_, status) in results]) + found_error = any(status is False for (_, status) in results) if (found_error or not silent) and len(results) > 1: click.echo() @@ -411,6 +411,6 @@ def calculate_project_hash(): for root, _, files in walk(d): for f in files: path = join(root, f) - if not any([s in path for s in (".git", ".svn", ".pioenvs")]): + if not any(s in path for s in (".git", ".svn", ".pioenvs")): structure.append(path) return sha1(",".join(sorted(structure))).hexdigest() if structure else "" diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py index 97014d2b..bcc202ab 100644 --- a/platformio/commands/upgrade.py +++ b/platformio/commands/upgrade.py @@ -36,7 +36,7 @@ def cli(dev): # kill all PIO Home servers, they block `pioplus` binary shutdown_servers() - to_develop = dev or not all([c.isdigit() for c in __version__ if c != "."]) + to_develop = dev or not all(c.isdigit() for c in __version__ if c != ".") cmds = ([ "pip", "install", "--upgrade", "https://github.com/platformio/platformio-core/archive/develop.zip" @@ -69,7 +69,7 @@ def cli(dev): if not r: raise exception.UpgradeError("\n".join([str(cmd), str(e)])) permission_errors = ("permission denied", "not permitted") - if (any([m in r['err'].lower() for m in permission_errors]) + if (any(m in r['err'].lower() for m in permission_errors) and "windows" not in util.get_systype()): click.secho( """ diff --git a/platformio/ide/tpls/visualstudio/platformio.vcxproj.filters.tpl b/platformio/ide/tpls/visualstudio/platformio.vcxproj.filters.tpl index d66bb4be..b29cb31f 100644 --- a/platformio/ide/tpls/visualstudio/platformio.vcxproj.filters.tpl +++ b/platformio/ide/tpls/visualstudio/platformio.vcxproj.filters.tpl @@ -15,7 +15,7 @@ % for file in src_files: - % if any([file.endswith(".%s" % e) for e in ("h", "hh", "hpp", "inc")]): + % if any(file.endswith(".%s" % e) for e in ("h", "hh", "hpp", "inc")): Header Files diff --git a/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl b/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl index b27a7ab2..82a011ad 100644 --- a/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl +++ b/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl @@ -60,7 +60,7 @@ % for file in src_files: - % if any([file.endswith(".%s" % e) for e in ("h", "hh", "hpp", "inc")]): + % if any(file.endswith(".%s" % e) for e in ("h", "hh", "hpp", "inc")): Header Files diff --git a/platformio/managers/lib.py b/platformio/managers/lib.py index 09c5ef12..e900fd97 100644 --- a/platformio/managers/lib.py +++ b/platformio/managers/lib.py @@ -365,7 +365,7 @@ class LibraryManager(BasePkgManager): for filters in self.normalize_dependencies(manifest['dependencies']): assert "name" in filters - if any([s in filters.get("version", "") for s in ("\\", "/")]): + if any(s in filters.get("version", "") for s in ("\\", "/")): self.install( "{name}={version}".format(**filters), silent=silent, @@ -420,6 +420,6 @@ def get_builtin_libs(storage_names=None): @util.memoized def is_builtin_lib(name): for storage in get_builtin_libs(): - if any([l.get("name") == name for l in storage['items']]): + if any(l.get("name") == name for l in storage['items']): return True return False