Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/utils/cborutil.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 | 687b865b95ad |
children | 8ff1ecfadcd1 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
174 Does not supporting indefinite length dictionaries. | 174 Does not supporting indefinite length dictionaries. |
175 """ | 175 """ |
176 yield encodelength(MAJOR_TYPE_MAP, len(d)) | 176 yield encodelength(MAJOR_TYPE_MAP, len(d)) |
177 | 177 |
178 for key, value in sorted( | 178 for key, value in sorted( |
179 d.iteritems(), key=lambda x: _mixedtypesortkey(x[0]) | 179 pycompat.iteritems(d), key=lambda x: _mixedtypesortkey(x[0]) |
180 ): | 180 ): |
181 for chunk in streamencode(key): | 181 for chunk in streamencode(key): |
182 yield chunk | 182 yield chunk |
183 for chunk in streamencode(value): | 183 for chunk in streamencode(value): |
184 yield chunk | 184 yield chunk |