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/goofy/goofy.py

diff --git a/py/goofy/goofy.py b/py/goofy/goofy.py
index 9f5583e..1382c0d 100755
--- a/py/goofy/goofy.py
+++ b/py/goofy/goofy.py
@@ -19,8 +19,6 @@
 import uuid
 import xmlrpc.client
 
-from six import iteritems
-
 from cros.factory.device import device_utils
 from cros.factory.goofy.goofy_rpc import GoofyRPC
 from cros.factory.goofy import goofy_server
@@ -306,7 +304,7 @@
     self.state_instance = state.FactoryState()
 
     # Write back the preserved data.
-    for key, value in iteritems(preserved_data):
+    for key, value in preserved_data.items():
       if value is not None:
         self.state_instance.DataShelfSetValue(key, value)
 
@@ -1134,7 +1132,7 @@
       if failed_test_lists:
         logging.info('Failed test list IDs: [%s]',
                      ' '.join(failed_test_lists.keys()))
-        for test_list_id, reason in iteritems(failed_test_lists):
+        for test_list_id, reason in failed_test_lists.items():
           logging.error('Error in test list %s: %s', test_list_id, reason)
           startup_errors.append('Error in test list %s:\n%s'
                                 % (test_list_id, reason))
@@ -1255,7 +1253,7 @@
 
     try:
       goofy_default_options = config_utils.LoadConfig(validate_schema=False)
-      for key, value in iteritems(goofy_default_options):
+      for key, value in goofy_default_options.items():
         if getattr(self.args, key, None) is None:
           logging.info('self.args.%s = %r', key, value)
           setattr(self.args, key, value)