diff hgext/fix.py @ 43105:649d3ac37a12

py3: define and use pycompat.iteritems() for hgext/

.iteritems() -> .items() is the last source transform being performed.
But it is also the most widely used.

This commit adds a pycompat.iteritems symbol and imports it in place
of .iteritems() for usage in hgext/. I chose to stop at just hgext/
because the patch will be large and it is an easy boundary to stop at
since we can disable source transformation on a per-package basis.

There are places where the type does implement items() and we could
call items() directly. However, this would require critical thought
and I thought it would be easier to just blindly change the code. We
know which call sites need to be audited in the future because they
have "pycompat.iteritems."

With this change, we no longer perform source transformation on
hgext!

Differential Revision: https://phab.mercurial-scm.org/D7014

--- a/hgext/fix.py	Sun Oct 06 17:59:15 2019 -0400
+++ b/hgext/fix.py	Sun Oct 06 19:25:18 2019 -0400
@@ -353,7 +353,9 @@
     Useful as a hook point for extending "hg fix" with output summarizing the
     effects of the command, though we choose not to output anything here.
     """
-    replacements = {prec: [succ] for prec, succ in replacements.iteritems()}
+    replacements = {
+        prec: [succ] for prec, succ in pycompat.iteritems(replacements)
+    }
     scmutil.cleanupnodes(repo, replacements, b'fix', fixphase=True)
 
 
@@ -619,7 +621,7 @@
     """
     metadata = {}
     newdata = fixctx[path].data()
-    for fixername, fixer in fixers.iteritems():
+    for fixername, fixer in pycompat.iteritems(fixers):
         if fixer.affects(opts, fixctx, path):
             ranges = lineranges(opts, path, basectxs, fixctx, newdata)
             command = fixer.command(ui, path, ranges)
@@ -695,7 +697,7 @@
 
     Directly updates the dirstate for the affected files.
     """
-    for path, data in filedata.iteritems():
+    for path, data in pycompat.iteritems(filedata):
         fctx = ctx[path]
         fctx.write(data, fctx.flags())
         if repo.dirstate[path] == b'n':