diff -r a0674e916fb6 -r f254fc73d956 mercurial/utils/cborutil.py --- a/mercurial/utils/cborutil.py Thu Mar 03 17:39:20 2022 -0800 +++ b/mercurial/utils/cborutil.py Thu Mar 03 18:28:30 2022 -0800 @@ -174,9 +174,7 @@ """ yield encodelength(MAJOR_TYPE_MAP, len(d)) - for key, value in sorted( - pycompat.iteritems(d), key=lambda x: _mixedtypesortkey(x[0]) - ): + for key, value in sorted(d.items(), key=lambda x: _mixedtypesortkey(x[0])): for chunk in streamencode(key): yield chunk for chunk in streamencode(value):