# HG changeset patch # User Augie Fackler # Date 1503446818 14400 # Node ID ba479850c9c79379743451faa28700afb581ea7a # Parent d5b2beca16c05f4f60fbd941682d47f053ccb909 python3: replace sorted(.iterkeys()) with sorted() diff -r d5b2beca16c0 -r ba479850c9c7 contrib/synthrepo.py --- a/contrib/synthrepo.py Tue Aug 22 20:03:07 2017 -0400 +++ b/contrib/synthrepo.py Tue Aug 22 20:06:58 2017 -0400 @@ -479,7 +479,7 @@ date = min(0x7fffffff, max(0, date)) user = random.choice(words) + '@' + random.choice(words) mc = context.memctx(repo, pl, makeline(minimum=2), - sorted(changes.iterkeys()), + sorted(changes), filectxfn, user, '%d %d' % (date, pick(tzoffset))) newnode = mc.commit() heads.add(repo.changelog.rev(newnode)) diff -r d5b2beca16c0 -r ba479850c9c7 mercurial/filelog.py --- a/mercurial/filelog.py Tue Aug 22 20:03:07 2017 -0400 +++ b/mercurial/filelog.py Tue Aug 22 20:06:58 2017 -0400 @@ -31,7 +31,7 @@ return meta, (s + 2) def packmeta(meta, text): - keys = sorted(meta.iterkeys()) + keys = sorted(meta) metatext = "".join("%s: %s\n" % (k, meta[k]) for k in keys) return "\1\n%s\1\n%s" % (metatext, text) diff -r d5b2beca16c0 -r ba479850c9c7 tests/test-hgweb-auth.py --- a/tests/test-hgweb-auth.py Tue Aug 22 20:03:07 2017 -0400 +++ b/tests/test-hgweb-auth.py Tue Aug 22 20:06:58 2017 -0400 @@ -25,7 +25,7 @@ def dumpdict(dict): return '{' + ', '.join(['%s: %s' % (k, dict[k]) - for k in sorted(dict.iterkeys())]) + '}' + for k in sorted(dict)]) + '}' def test(auth, urls=None): print('CFG:', dumpdict(auth))