Fix PyLint issues: consider-using-with

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))
+        used_blocks = min(
-        if used_blocks > blocks_per_progress:
+            int(round(blocks_per_progress * percent_raw)), blocks_per_progress
-            used_blocks = blocks_per_progress
+        )
         return "[{:{}}] {: 6.1%} (used {:d} bytes from {:d} bytes)".format(
             "=" * used_blocks, blocks_per_progress, percent_raw, value, total
         )

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
 

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:

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)

platformio/proc.py

@@ -109,16 +109,16 @@ def exec_command(*args, **kwargs):
     default.update(kwargs)
     kwargs = default
 
-    p = subprocess.Popen(*args, **kwargs)
+    with subprocess.Popen(*args, **kwargs) as p:
-    try:
+        try:
-        result["out"], result["err"] = p.communicate()
+            result["out"], result["err"] = p.communicate()
-        result["returncode"] = p.returncode
+            result["returncode"] = p.returncode
-    except KeyboardInterrupt:
+        except KeyboardInterrupt:
-        raise exception.AbortedByUser()
+            raise exception.AbortedByUser()
-    finally:
+        finally:
-        for s in ("stdout", "stderr"):
+            for s in ("stdout", "stderr"):
-            if isinstance(kwargs[s], AsyncPipeBase):
+                if isinstance(kwargs[s], AsyncPipeBase):
-                kwargs[s].close()
+                    kwargs[s].close()
 
     for s in ("stdout", "stderr"):
         if isinstance(kwargs[s], AsyncPipeBase):