--- a/mercurial/util.py	Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/util.py	Mon Oct 07 00:04:04 2019 -0400
@@ -1265,7 +1265,7 @@
         # __setitem__() isn't called as of PyPy 5.8.0
         def update(self, src):
             if isinstance(src, dict):
-                src = src.iteritems()
+                src = pycompat.iteritems(src)
             for k, v in src:
                 self[k] = v
 
@@ -3501,7 +3501,7 @@
         self._dirs = {}
         addpath = self.addpath
         if isinstance(map, dict) and skip is not None:
-            for f, s in map.iteritems():
+            for f, s in pycompat.iteritems(map):
                 if s[0] != skip:
                     addpath(f)
         elif skip is not None: