Patchwork D12332: merge: remove pycompat.iteritems()

login
register
mail settings
Submitter phabricator
Date March 3, 2022, 9:23 p.m.
Message ID <differential-rev-PHID-DREV-cg34jrxtdsrcz5pleftk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50673/
State New
Headers show

Comments

phabricator - March 3, 2022, 9:23 p.m.
indygreg created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12332

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -625,9 +625,7 @@ 
                     args, msg = self._actionmapping[a][f]
                     yield f, args, msg
             else:
-                for f, (args, msg) in pycompat.iteritems(
-                    self._actionmapping[a]
-                ):
+                for f, (args, msg) in self._actionmapping[a].items():
                     yield f, args, msg
 
     def len(self, actions=None):