--- a/mercurial/tags.py	Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/tags.py	Mon Oct 07 00:04:04 2019 -0400
@@ -27,6 +27,7 @@
     encoding,
     error,
     match as matchmod,
+    pycompat,
     scmutil,
     util,
 )
@@ -355,7 +356,7 @@
     if tagtype is None:
         assert tagtypes is None
 
-    for name, nodehist in filetags.iteritems():
+    for name, nodehist in pycompat.iteritems(filetags):
         if name not in alltags:
             alltags[name] = nodehist
             if tagtype is not None:
@@ -536,7 +537,7 @@
     # we keep them in UTF-8 throughout this module.  If we converted
     # them local encoding on input, we would lose info writing them to
     # the cache.
-    for (name, (node, hist)) in sorted(cachetags.iteritems()):
+    for (name, (node, hist)) in sorted(pycompat.iteritems(cachetags)):
         for n in hist:
             cachefile.write(b"%s %s\n" % (hex(n), name))
         cachefile.write(b"%s %s\n" % (hex(node), name))