Mercurial > hg-stable
changeset 32881:9e3733d93f64
py3: replace dict.iterkeys() with iter(dict)
dict.iterkeys() does not exists on Python 3.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 16 Jun 2017 01:46:47 +0530 |
| parents | e4a43b810528 |
| children | f57f1f37290d |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Jun 16 01:28:23 2017 +0530 +++ b/mercurial/merge.py Fri Jun 16 01:46:47 2017 +0530 @@ -838,7 +838,7 @@ for copykey, copyvalue in copy.iteritems(): if copyvalue in relevantfiles: relevantfiles.add(copykey) - for movedirkey in movewithdir.iterkeys(): + for movedirkey in movewithdir: relevantfiles.add(movedirkey) filesmatcher = scmutil.matchfiles(repo, relevantfiles) matcher = matchmod.intersectmatchers(matcher, filesmatcher)