comparison mercurial/filemerge.py @ 43106:d783f945a701

py3: finish porting iteritems() to pycompat and remove source transformer This commit finishes porting .iteritems() to pycompat.iteritems() for the mercurial package. The translation of .iteritems() to .items() was the last conversion performed by the source transformer. With the porting to pycompat complete, we no longer have a need for the source transformer. So the source transformer has been removed. Good riddance! The code base is now compatible with Python 2 and Python 3. For the record, as the person who introduced the source transformer, it brings me joy to delete it. It accomplished its goal to facilitate a port to Python 3 without overly burdening people on some painful low-level differences between Python 2 and 3. It is unfortunate we still have to wallpaper over many differences with the pycompat shim. But it is what it is. Differential Revision: https://phab.mercurial-scm.org/D7015
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 07 Oct 2019 00:04:04 -0400
parents c59eb1560c44
children 8ff1ecfadcd1
comparison
equal deleted inserted replaced
43105:649d3ac37a12 43106:d783f945a701
1229 1229
1230 1230
1231 def loadinternalmerge(ui, extname, registrarobj): 1231 def loadinternalmerge(ui, extname, registrarobj):
1232 """Load internal merge tool from specified registrarobj 1232 """Load internal merge tool from specified registrarobj
1233 """ 1233 """
1234 for name, func in registrarobj._table.iteritems(): 1234 for name, func in pycompat.iteritems(registrarobj._table):
1235 fullname = b':' + name 1235 fullname = b':' + name
1236 internals[fullname] = func 1236 internals[fullname] = func
1237 internals[b'internal:' + name] = func 1237 internals[b'internal:' + name] = func
1238 internalsdoc[fullname] = func 1238 internalsdoc[fullname] = func
1239 1239