--- a/hgext/fastannotate/context.py Sun Oct 06 17:59:15 2019 -0400
+++ b/hgext/fastannotate/context.py Sun Oct 06 19:25:18 2019 -0400
@@ -169,7 +169,7 @@
def __init__(self, **opts):
opts = pycompat.byteskwargs(opts)
- for k, v in self.defaults.iteritems():
+ for k, v in pycompat.iteritems(self.defaults):
setattr(self, k, opts.get(k, v))
@util.propertycache
@@ -578,7 +578,7 @@
# find an unresolved line and its linelog rev to annotate
hsh = None
try:
- for (rev, _linenum), idxs in key2idxs.iteritems():
+ for (rev, _linenum), idxs in pycompat.iteritems(key2idxs):
if revmap.rev2flag(rev) & revmapmod.sidebranchflag:
continue
hsh = annotateresult[idxs[0]][0]
@@ -589,7 +589,7 @@
# the remaining key2idxs are not in main branch, resolving them
# using the hard way...
revlines = {}
- for (rev, linenum), idxs in key2idxs.iteritems():
+ for (rev, linenum), idxs in pycompat.iteritems(key2idxs):
if rev not in revlines:
hsh = annotateresult[idxs[0]][0]
if self.ui.debugflag: