Mercurial > hg
comparison mercurial/patch.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 | 74802979dd9d |
children | 8ff1ecfadcd1 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
2624 | 2624 |
2625 if copysourcematch: | 2625 if copysourcematch: |
2626 # filter out copies where source side isn't inside the matcher | 2626 # filter out copies where source side isn't inside the matcher |
2627 # (copies.pathcopies() already filtered out the destination) | 2627 # (copies.pathcopies() already filtered out the destination) |
2628 copy = { | 2628 copy = { |
2629 dst: src for dst, src in copy.iteritems() if copysourcematch(src) | 2629 dst: src |
2630 for dst, src in pycompat.iteritems(copy) | |
2631 if copysourcematch(src) | |
2630 } | 2632 } |
2631 | 2633 |
2632 modifiedset = set(modified) | 2634 modifiedset = set(modified) |
2633 addedset = set(added) | 2635 addedset = set(added) |
2634 removedset = set(removed) | 2636 removedset = set(removed) |