commit 879fbdadc51682ca8a80e41e44caea10f93a1e53
author Yilin Yang <kerker@google.com> Thu May 14 13:52:30 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Sat May 23 03:39:46 2020 +0000
tree 034d1255a9be85937bea3ddcf94d05e69e2bddad
parent 90761403f2a737778853c36284e77cf0d0a08a45

factory: Use `dict.items` instead of `six.iteritems`

`six.iteritems` is equivalent to `dict.items` in python3, so we can
migrate all of this.

BUG=chromium:999876
TEST=make test

Change-Id: I7218c416e694da41996ae3ace6ce23e6f9fcfb72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/2200487
Reviewed-by: Yilin Yang (kerker) <kerker@chromium.org>
Tested-by: Yilin Yang (kerker) <kerker@chromium.org>
Commit-Queue: Yilin Yang (kerker) <kerker@chromium.org>

py/tools/ovl.py

diff --git a/py/tools/ovl.py b/py/tools/ovl.py
index b1603a1..a6b4cfe 100755
--- a/py/tools/ovl.py
+++ b/py/tools/ovl.py
@@ -39,7 +39,6 @@
 import jsonrpclib
 from jsonrpclib.config import Config
 from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
-from six import iteritems
 from ws4py.client import WebSocketBaseClient
 import yaml
 
@@ -674,7 +673,7 @@
   This decorator retrieve command info from each method and append it in to the
   SUBCOMMANDS class variable, which is later used to construct parser.
   """
-  for unused_key, method in iteritems(cls.__dict__):
+  for unused_key, method in cls.__dict__.items():
     if hasattr(method, '__arg_attr'):
       # pylint: disable=protected-access
       cls.SUBCOMMANDS.append(method.__arg_attr)