factory: Migrate dict.iteritems() to py2/3 compatible semantic
`dict.iteritems()` is deprecated in python3.
There is a py2/3 compatibility utilities called six module.
And we can use the `iteritems()` in this module.
BUG=chromium:999876
TEST=make test
TEST=make lint with enable=dict-iter-method on
TEST=umpire test
Change-Id: I5612d24d063f23f7f1d8e6cd39c3e1776605f69c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/1826580
Reviewed-by: Cheng-Han Yang <chenghan@chromium.org>
Tested-by: Yilin Yang <kerker@chromium.org>
Auto-Submit: Yilin Yang <kerker@chromium.org>
Commit-Queue: Yilin Yang <kerker@chromium.org>
diff --git a/py/utils/pygpt.py b/py/utils/pygpt.py
index a69d63a..e1d59a7 100755
--- a/py/utils/pygpt.py
+++ b/py/utils/pygpt.py
@@ -39,6 +39,7 @@
import sys
import uuid
+from six import iteritems
class StructError(Exception):
"""Exceptions in packing and unpacking from/to struct fields."""
@@ -280,7 +281,7 @@
self.Zero()
all_names = [f for f in self.__slots__]
- for name, value in kargs.iteritems():
+ for name, value in iteritems(kargs):
if name not in all_names:
raise GPTError('%s does not support keyword arg <%s>.' %
(type(self).__name__, name))
@@ -342,7 +343,7 @@
def Update(self, **dargs):
"""Applies multiple values in current object."""
- for name, value in dargs.iteritems():
+ for name, value in iteritems(dargs):
setattr(self, name, value)
def Zero(self):
@@ -389,7 +390,7 @@
}
TYPE_GUID_FROM_NAME = dict(
('efi' if v.startswith('EFI') else v.lower().split()[-1], k)
- for k, v in TYPE_GUID_MAP.iteritems())
+ for k, v in iteritems(TYPE_GUID_MAP))
TYPE_GUID_UNUSED = TYPE_GUID_FROM_NAME['unused']
TYPE_GUID_CHROMEOS_KERNEL = TYPE_GUID_FROM_NAME['kernel']
TYPE_GUID_LIST_BOOTABLE = [
@@ -958,7 +959,7 @@
def DefineArgs(self, parser):
"""Defines all available commands to an argparser subparsers instance."""
subparsers = parser.add_subparsers(help='Sub-command help.', dest='command')
- for name, instance in sorted(self.commands.iteritems()):
+ for name, instance in sorted(iteritems(self.commands)):
parser = subparsers.add_parser(
name, description=instance.__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter,