D12332: merge: remove pycompat.iteritems()

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 Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Thu, 3 Mar 2022 21:23:51 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D12332: merge: remove pycompat.iteritems() Message-ID: <differential-rev-PHID-DREV-cg34jrxtdsrcz5pleftk-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-cg34jrxtdsrcz5pleftk Thread-Index: MDI3NDY0YWVmNDM5YmUzMjRiNmI5NjAzYzkw MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D12332+public+a6287efea0de75a8@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

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):

Patchwork D12332: merge: remove pycompat.iteritems()

Comments

Patch