--- a/mercurial/templater.py	Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/templater.py	Mon Oct 07 00:04:04 2019 -0400
@@ -514,7 +514,8 @@
 
     def compiledict(xs):
         return util.sortdict(
-            (k, compileexp(x, context, curmethods)) for k, x in xs.iteritems()
+            (k, compileexp(x, context, curmethods))
+            for k, x in pycompat.iteritems(xs)
         )
 
     def compilelist(xs):
@@ -691,7 +692,7 @@
         newres = self._resources.availablekeys(newmapping)
         mapping = {
             k: v
-            for k, v in origmapping.iteritems()
+            for k, v in pycompat.iteritems(origmapping)
             if (
                 k in knownres  # not a symbol per self.symbol()
                 or newres.isdisjoint(self._defaultrequires(k))