p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Replace iteritems with items." 

am: 6623fdda5a

Change-Id: I35c9e3b39897d20463aa12252a6118b427e64dfc
This commit is contained in:
Tao Bao 2019-07-11 11:39:41 -07:00 committed by android-build-merger
parent 533733d1e8 6623fdda5a
commit 213210c4d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/common.py
View File

@ -1460,7 +1460,7 @@ class PasswordManager(object):
values.
"""
result = {}
for k, v in sorted(current.iteritems()):
for k, v in sorted(current.items()):
if v:
result[k] = v
else:
@ -1481,7 +1481,7 @@ class PasswordManager(object):
f.write("# (Additional spaces are harmless.)\n\n")
first_line = None
sorted_list = sorted([(not v, k, v) for (k, v) in current.iteritems()])
sorted_list = sorted([(not v, k, v) for (k, v) in current.items()])
for i, (_, k, v) in enumerate(sorted_list):
f.write("[[[ %s ]]] %s\n" % (v, k))
if not v and first_line is None:
@ -1647,7 +1647,7 @@ class DeviceSpecificParams(object):
"""Keyword arguments to the constructor become attributes of this
object, which is passed to all functions in the device-specific
module."""
for k, v in kwargs.iteritems():
for k, v in kwargs.items():
setattr(self, k, v)
self.extras = OPTIONS.extras