From b5c1a195be6ac0a160c9d778dc26606e06224076 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 28 Apr 2021 19:59:37 +0300 Subject: [PATCH] Fix PyLint issues: consider-using-with --- platformio/builder/tools/pioupload.py | 6 +++--- .../commands/device/filters/log2file.py | 1 + platformio/package/download.py | 2 +- platformio/package/lockfile.py | 2 +- platformio/proc.py | 20 +++++++++---------- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/platformio/builder/tools/pioupload.py b/platformio/builder/tools/pioupload.py index 3281ada4..23f252e5 100644 --- a/platformio/builder/tools/pioupload.py +++ b/platformio/builder/tools/pioupload.py @@ -236,9 +236,9 @@ def CheckUploadSize(_, target, source, env): def _format_availale_bytes(value, total): percent_raw = float(value) / float(total) blocks_per_progress = 10 - used_blocks = int(round(blocks_per_progress * percent_raw)) - if used_blocks > blocks_per_progress: - used_blocks = blocks_per_progress + used_blocks = min( + int(round(blocks_per_progress * percent_raw)), blocks_per_progress + ) return "[{:{}}] {: 6.1%} (used {:d} bytes from {:d} bytes)".format( "=" * used_blocks, blocks_per_progress, percent_raw, value, total ) diff --git a/platformio/commands/device/filters/log2file.py b/platformio/commands/device/filters/log2file.py index 69118510..d7199a19 100644 --- a/platformio/commands/device/filters/log2file.py +++ b/platformio/commands/device/filters/log2file.py @@ -31,6 +31,7 @@ class LogToFile(DeviceMonitorFilter): "%y%m%d-%H%M%S" ) print("--- Logging an output to %s" % os.path.abspath(log_file_name)) + # pylint: disable=consider-using-with self._log_fp = io.open(log_file_name, "w", encoding="utf-8") return self diff --git a/platformio/package/download.py b/platformio/package/download.py index bd425ac6..ffc57d50 100644 --- a/platformio/package/download.py +++ b/platformio/package/download.py @@ -73,7 +73,7 @@ class FileDownloader(object): def start(self, with_progress=True, silent=False): label = "Downloading" itercontent = self._request.iter_content(chunk_size=io.DEFAULT_BUFFER_SIZE) - fp = open(self._destination, "wb") + fp = open(self._destination, "wb") # pylint: disable=consider-using-with try: if not with_progress or self.get_size() == -1: if not silent: diff --git a/platformio/package/lockfile.py b/platformio/package/lockfile.py index db4b1d3f..6cfc46ef 100644 --- a/platformio/package/lockfile.py +++ b/platformio/package/lockfile.py @@ -62,7 +62,7 @@ class LockFile(object): else: raise LockFileExists - self._fp = open(self._lock_path, "w") + self._fp = open(self._lock_path, "w") # pylint: disable=consider-using-with try: if LOCKFILE_CURRENT_INTERFACE == LOCKFILE_INTERFACE_FCNTL: fcntl.flock(self._fp.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) diff --git a/platformio/proc.py b/platformio/proc.py index 6e9981af..7e93907d 100644 --- a/platformio/proc.py +++ b/platformio/proc.py @@ -109,16 +109,16 @@ def exec_command(*args, **kwargs): default.update(kwargs) kwargs = default - p = subprocess.Popen(*args, **kwargs) - try: - result["out"], result["err"] = p.communicate() - result["returncode"] = p.returncode - except KeyboardInterrupt: - raise exception.AbortedByUser() - finally: - for s in ("stdout", "stderr"): - if isinstance(kwargs[s], AsyncPipeBase): - kwargs[s].close() + with subprocess.Popen(*args, **kwargs) as p: + try: + result["out"], result["err"] = p.communicate() + result["returncode"] = p.returncode + except KeyboardInterrupt: + raise exception.AbortedByUser() + finally: + for s in ("stdout", "stderr"): + if isinstance(kwargs[s], AsyncPipeBase): + kwargs[s].close() for s in ("stdout", "stderr"): if isinstance(kwargs[s], AsyncPipeBase):