From e94d758131dc1b05847db614a831549ddead9d4f Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 27 Oct 2018 20:51:55 +0300
Subject: [PATCH] Use "items" instead of "iteritems" (PY2/3) // Issue #895

---
 platformio/commands/ci.py       | 2 +-
 platformio/commands/device.py   | 6 +++---
 platformio/commands/lib.py      | 2 +-
 platformio/managers/platform.py | 2 +-
 platformio/telemetry.py         | 2 +-
 platformio/util.py              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py
index 0db1daa9..0abf72d2 100644
--- a/platformio/commands/ci.py
+++ b/platformio/commands/ci.py
@@ -86,7 +86,7 @@ def cli(  # pylint: disable=too-many-arguments
         app.set_session_var("force_option", True)
         _clean_dir(build_dir)
 
-        for dir_name, patterns in dict(lib=lib, src=src).iteritems():
+        for dir_name, patterns in dict(lib=lib, src=src).items():
             if not patterns:
                 continue
             contents = []
diff --git a/platformio/commands/device.py b/platformio/commands/device.py
index 78bb7cdc..450b52bd 100644
--- a/platformio/commands/device.py
+++ b/platformio/commands/device.py
@@ -55,7 +55,7 @@ def device_list(  # pylint: disable=too-many-branches
         "mdns": "Multicast DNS Services"
     }
 
-    for key, value in data.iteritems():
+    for key, value in data.items():
         if not single_key:
             click.secho(titles[key], bold=True)
             click.echo("=" * len(titles[key]))
@@ -85,7 +85,7 @@ def device_list(  # pylint: disable=too-many-branches
                 if item['properties']:
                     click.echo("Properties: %s" % ("; ".join([
                         "%s=%s" % (k, v)
-                        for k, v in item['properties'].iteritems()
+                        for k, v in item['properties'].items()
                     ])))
                 click.echo("")
 
@@ -182,7 +182,7 @@ def device_monitor(**kwargs):  # pylint: disable=too-many-branches
             kwargs['port'] = ports[0]['port']
 
     sys.argv = ["monitor"]
-    for k, v in kwargs.iteritems():
+    for k, v in kwargs.items():
         if k in ("port", "baud", "rts", "dtr", "environment", "project_dir"):
             continue
         k = "--" + k.replace("_", "-")
diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py
index af107d3d..c305dad6 100644
--- a/platformio/commands/lib.py
+++ b/platformio/commands/lib.py
@@ -203,7 +203,7 @@ def lib_search(query, json_output, page, noninteractive, **filters):
     if not isinstance(query, list):
         query = list(query)
 
-    for key, values in filters.iteritems():
+    for key, values in filters.items():
         for value in values:
             query.append('%s:"%s"' % (key, value))
 
diff --git a/platformio/managers/platform.py b/platformio/managers/platform.py
index 04c4d931..35e842db 100644
--- a/platformio/managers/platform.py
+++ b/platformio/managers/platform.py
@@ -604,7 +604,7 @@ class PlatformBase(  # pylint: disable=too-many-public-methods
 
         # enable upload tools for upload targets
         if any(["upload" in t for t in targets] + ["program" in targets]):
-            for name, opts in self.packages.iteritems():
+            for name, opts in self.packages.items():
                 if opts.get("type") == "uploader":
                     self.packages[name]['optional'] = False
                 # skip all packages in "nobuild" mode
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index 392c2cbe..7394654c 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -291,7 +291,7 @@ def measure_ci():
         }
     }
 
-    for key, value in envmap.iteritems():
+    for key, value in envmap.items():
         if getenv(key, "").lower() != "true":
             continue
         event.update({"action": key, "label": value['label']})
diff --git a/platformio/util.py b/platformio/util.py
index 7e45fb73..c5433ee3 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -413,7 +413,7 @@ def exec_command(*args, **kwargs):
         if isinstance(kwargs[s], AsyncPipe):
             result[s[3:]] = "\n".join(kwargs[s].get_buffer())
 
-    for k, v in result.iteritems():
+    for k, v in result.items():
         if v and isinstance(v, basestring):
             result[k].strip()