diff -r 649d3ac37a12 -r d783f945a701 mercurial/ui.py
--- a/mercurial/ui.py	Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/ui.py	Mon Oct 07 00:04:04 2019 -0400
@@ -2220,7 +2220,7 @@
         # Now process the sub-options. If a sub-option is registered, its
         # attribute will always be present. The value will be None if there
         # was no valid sub-option.
-        for suboption, (attr, func) in _pathsuboptions.iteritems():
+        for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
             if suboption not in suboptions:
                 setattr(self, attr, None)
                 continue
@@ -2246,7 +2246,7 @@
         This is intended to be used for presentation purposes.
         """
         d = {}
-        for subopt, (attr, _func) in _pathsuboptions.iteritems():
+        for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
             value = getattr(self, attr)
             if value is not None:
                 d[subopt] = value