Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 48913:f254fc73d956
global: bulk replace simple pycompat.iteritems(x) with x.items()
pycompat.iteritems() just calls .items().
This commit applies a regular expression search and replace to convert
simple instances of pycompat.iteritems() with .items(). There are still
a handful of calls to pycompat.iteritems() remaining. But these all have
more complicated expressions that I wasn't comfortable performing an
automated replace on. In addition, some simple replacements were withheld
because they broke pytype. These will be handled by their own changesets.
Differential Revision: https://phab.mercurial-scm.org/D12318
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 03 Mar 2022 18:28:30 -0800 |
| parents | 6000f5b25c9b |
| children | 642e31cb55f0 |
comparison
equal
deleted
inserted
replaced
| 48912:a0674e916fb6 | 48913:f254fc73d956 |
|---|---|
| 1197 return repo.wjoin(ctx.path()) | 1197 return repo.wjoin(ctx.path()) |
| 1198 | 1198 |
| 1199 | 1199 |
| 1200 def loadinternalmerge(ui, extname, registrarobj): | 1200 def loadinternalmerge(ui, extname, registrarobj): |
| 1201 """Load internal merge tool from specified registrarobj""" | 1201 """Load internal merge tool from specified registrarobj""" |
| 1202 for name, func in pycompat.iteritems(registrarobj._table): | 1202 for name, func in registrarobj._table.items(): |
| 1203 fullname = b':' + name | 1203 fullname = b':' + name |
| 1204 internals[fullname] = func | 1204 internals[fullname] = func |
| 1205 internals[b'internal:' + name] = func | 1205 internals[b'internal:' + name] = func |
| 1206 internalsdoc[fullname] = func | 1206 internalsdoc[fullname] = func |
| 1207 | 1207 |