Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e2351a authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Replace iteritems with items." am: 6623fdda

am: 213210c4

Change-Id: I3bb134132776451b565ed899b3a57d609797587d
parents c6a13166 213210c4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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