diff -r 649d3ac37a12 -r d783f945a701 mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/hgweb/webutil.py Mon Oct 07 00:04:04 2019 -0400 @@ -57,7 +57,7 @@ allowed = ui.configlist(b'web', b'allow-archive', untrusted=True) archives = [] - for typ, spec in archivespecs.iteritems(): + for typ, spec in pycompat.iteritems(archivespecs): if typ in allowed or ui.configbool( b'web', b'allow' + typ, untrusted=True ): @@ -852,7 +852,7 @@ def itermaps(self, context): separator = self._start - for key, value in sorted(self._vars.iteritems()): + for key, value in sorted(pycompat.iteritems(self._vars)): yield { b'name': key, b'value': pycompat.bytestr(value),