diff -r 649d3ac37a12 -r d783f945a701 mercurial/utils/cborutil.py --- a/mercurial/utils/cborutil.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/utils/cborutil.py Mon Oct 07 00:04:04 2019 -0400 @@ -176,7 +176,7 @@ yield encodelength(MAJOR_TYPE_MAP, len(d)) for key, value in sorted( - d.iteritems(), key=lambda x: _mixedtypesortkey(x[0]) + pycompat.iteritems(d), key=lambda x: _mixedtypesortkey(x[0]) ): for chunk in streamencode(key): yield chunk