commit 8e57b4bc55c05081b8f6331da37f41b558920dfb
author Marc-Antoine Ruel <maruel@chromium.org> Fri Oct 11 01:01:36 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Oct 11 01:01:36 2019 +0000
tree f0ba56fc4ccf4fb8b3f244cf9009910f21ce384f
parent e1410883a38ac3a3491ed470883ec405193442f6

python3 improvements

Ran:
  vi $(git grep --name-only iteritems | grep -v third_party)
  vi $(git grep --name-only itervalues | grep -v third_party)
  vi $(git grep --name-only 'print ' | grep -v third_party)

and edited the files quickly with adhoc macros. Then ran in recipes/:
  ./recipes.py test train

There was only a small subset of files that had been updated to use
six.iteritems() and six.itervalues(). Since the dataset size that is
being used in gclient is small (pretty much always below 200 items),
it's better to just switch to .items() right away and take the temporary
performance hit, so that we don't need to come back to rewrite the code.

Recipe-Nontrivial-Roll: build
Bug: 984182
Change-Id: I5faf11486b66b0d73c9098ab0f2ce1b15a45c53e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1854900
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Marc-Antoine Ruel <maruel@chromium.org>

git_rebase_update.py

diff --git a/git_rebase_update.py b/git_rebase_update.py
index e1d6b22..a559d07 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -57,12 +57,12 @@
     dest_spec = fetchspec.partition(':')[2]
     remote_name = key.split('.')[1]
     fetchspec_map[dest_spec] = remote_name
-  for parent in branch_tree.itervalues():
+  for parent in branch_tree.values():
     if parent in tag_set:
       fetch_tags = True
     else:
       full_ref = git.run('rev-parse', '--symbolic-full-name', parent)
-      for dest_spec, remote_name in fetchspec_map.iteritems():
+      for dest_spec, remote_name in fetchspec_map.items():
         if fnmatch(full_ref, dest_spec):
           remotes.add(remote_name)
           break
@@ -121,7 +121,7 @@
           reparents[down] = (order, parent, old_parent)
 
   # Apply all reparenting recorded, in order.
-  for branch, value in sorted(reparents.iteritems(), key=lambda x:x[1][0]):
+  for branch, value in sorted(reparents.items(), key=lambda x:x[1][0]):
     _, parent, old_parent = value
     if parent in tag_set:
       git.set_branch_config(branch, 'remote', '.')
@@ -134,7 +134,7 @@
                                                              old_parent))
 
   # Apply all deletions recorded, in order.
-  for branch, _ in sorted(deletions.iteritems(), key=lambda x: x[1]):
+  for branch, _ in sorted(deletions.items(), key=lambda x: x[1]):
     print(git.run('branch', '-d', branch))
 
 
@@ -272,7 +272,7 @@
     fetch_remotes(branch_tree)
 
   merge_base = {}
-  for branch, parent in branch_tree.iteritems():
+  for branch, parent in branch_tree.items():
     merge_base[branch] = git.get_or_create_merge_base(branch, parent)
 
   logging.debug('branch_tree: %s' % pformat(branch_tree))