diff -r 649d3ac37a12 -r d783f945a701 mercurial/revset.py --- a/mercurial/revset.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/revset.py Mon Oct 07 00:04:04 2019 -0400 @@ -577,7 +577,7 @@ bms.add(repo[bmrev].rev()) else: matchrevs = set() - for name, bmrev in repo._bookmarks.iteritems(): + for name, bmrev in pycompat.iteritems(repo._bookmarks): if matcher(name): matchrevs.add(bmrev) for bmrev in matchrevs: @@ -1612,7 +1612,7 @@ ) namespaces.add(repo.names[pattern]) else: - for name, ns in repo.names.iteritems(): + for name, ns in pycompat.iteritems(repo.names): if matcher(name): namespaces.add(ns) @@ -2681,7 +2681,7 @@ def loadpredicate(ui, extname, registrarobj): """Load revset predicates from specified registrarobj """ - for name, func in registrarobj._table.iteritems(): + for name, func in pycompat.iteritems(registrarobj._table): symbols[name] = func if func._safe: safesymbols.add(name)