( )⚙ D12335 templatekw: remove pycompat.iteritems()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12335

templatekw: remove pycompat.iteritems()
ClosedPublic

Authored by indygreg on Mar 3 2022, 4:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe6df205a876c: templatekw: remove pycompat.iteritems()

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 3 2022, 4:22 PM
Alphare accepted this revision.Mar 8 2022, 4:31 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:31 AM
indygreg added a commit: rHGe6df205a876c: templatekw: remove pycompat.iteritems().Mar 8 2022, 6:00 AM
Closed by commit rHGe6df205a876c: templatekw: remove pycompat.iteritems() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templatekw.py (2 lines)

Diff 32546

mercurial/templatekw.py

all_paths = urlutil.list_paths(repo.ui) all_paths = urlutil.list_paths(repo.ui)
urls = util.sortdict((k, p.rawloc) for k, p in all_paths) urls = util.sortdict((k, p.rawloc) for k, p in all_paths)
def makemap(k): def makemap(k):
ps = paths[k] ps = paths[k]
d = {b'name': k} d = {b'name': k}
if len(ps) == 1: if len(ps) == 1:
d[b'url'] = ps[0].rawloc d[b'url'] = ps[0].rawloc
sub_opts = pycompat.iteritems(ps[0].suboptions) sub_opts = ps[0].suboptions.items()
sub_opts = util.sortdict(sorted(sub_opts)) sub_opts = util.sortdict(sorted(sub_opts))
d.update(sub_opts) d.update(sub_opts)
path_dict = util.sortdict() path_dict = util.sortdict()
for p in ps: for p in ps:
sub_opts = util.sortdict(sorted(p.suboptions.items())) sub_opts = util.sortdict(sorted(p.suboptions.items()))
path_dict[b'url'] = p.rawloc path_dict[b'url'] = p.rawloc
path_dict.update(sub_opts) path_dict.update(sub_opts)
d[b'urls'] = [path_dict] d[b'urls'] = [path_dict]