From ff6d1698626aff801f5fc96bd29f2d6cd254b365 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 5 Jul 2021 13:30:37 +0300
Subject: [PATCH] Fix PyLint for v2.9.3

---
 .pylintrc                          |  1 +
 platformio/package/manager/core.py |  1 +
 platformio/package/unpack.py       |  8 ++++++--
 platformio/proc.py                 | 12 ++++++------
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index bb68f8a0..4a7f6601 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -15,6 +15,7 @@ disable=
     useless-object-inheritance,
     useless-import-alias,
     bad-option-value,
+    consider-using-dict-items,
 
     ; PY2 Compat
     super-with-arguments,
diff --git a/platformio/package/manager/core.py b/platformio/package/manager/core.py
index ac5cad7b..63251af3 100644
--- a/platformio/package/manager/core.py
+++ b/platformio/package/manager/core.py
@@ -78,6 +78,7 @@ def remove_unnecessary_core_packages(dry_run=False):
         pkg = pm.get_package(spec)
         if not pkg:
             continue
+        # pylint: disable=no-member
         best_pkg_versions[pkg.metadata.name] = pkg.metadata.version
 
     for pkg in pm.get_installed():
diff --git a/platformio/package/unpack.py b/platformio/package/unpack.py
index 2913660d..6bbbef63 100644
--- a/platformio/package/unpack.py
+++ b/platformio/package/unpack.py
@@ -57,7 +57,9 @@ class BaseArchiver(object):
 
 class TARArchiver(BaseArchiver):
     def __init__(self, archpath):
-        super(TARArchiver, self).__init__(tarfile_open(archpath))
+        super(TARArchiver, self).__init__(
+            tarfile_open(archpath)  # pylint: disable=consider-using-with
+        )
 
     def get_items(self):
         return self._afo.getmembers()
@@ -99,7 +101,9 @@ class TARArchiver(BaseArchiver):
 
 class ZIPArchiver(BaseArchiver):
     def __init__(self, archpath):
-        super(ZIPArchiver, self).__init__(ZipFile(archpath))
+        super(ZIPArchiver, self).__init__(
+            ZipFile(archpath)  # pylint: disable=consider-using-with
+        )
 
     @staticmethod
     def preserve_permissions(item, dest_dir):
diff --git a/platformio/proc.py b/platformio/proc.py
index 7e93907d..20f59710 100644
--- a/platformio/proc.py
+++ b/platformio/proc.py
@@ -124,16 +124,16 @@ def exec_command(*args, **kwargs):
         if isinstance(kwargs[s], AsyncPipeBase):
             result[s[3:]] = kwargs[s].get_buffer()
 
-    for k, v in result.items():
-        if isinstance(result[k], bytes):
+    for key, value in result.items():
+        if isinstance(value, bytes):
             try:
-                result[k] = result[k].decode(
+                result[key] = value.decode(
                     get_locale_encoding() or get_filesystem_encoding()
                 )
             except UnicodeDecodeError:
-                result[k] = result[k].decode("latin-1")
-        if v and isinstance(v, string_types):
-            result[k] = result[k].strip()
+                result[key] = value.decode("latin-1")
+        if value and isinstance(value, string_types):
+            result[key] = value.strip()
 
     return result