Mercurial > public > mercurial-scm > hg
comparison mercurial/formatter.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 | 1d12ae5096d1 |
children | 242ad45b60b3 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
278 | 278 |
279 | 279 |
280 def _iteritems(data): | 280 def _iteritems(data): |
281 '''iterate key-value pairs in stable order''' | 281 '''iterate key-value pairs in stable order''' |
282 if isinstance(data, dict): | 282 if isinstance(data, dict): |
283 return sorted(data.iteritems()) | 283 return sorted(pycompat.iteritems(data)) |
284 return data | 284 return data |
285 | 285 |
286 | 286 |
287 class _plainconverter(object): | 287 class _plainconverter(object): |
288 '''convert non-primitive data types to text''' | 288 '''convert non-primitive data types to text''' |