Mercurial > public > mercurial-scm > hg
comparison mercurial/obsutil.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 |
---|---|
13 from . import ( | 13 from . import ( |
14 diffutil, | 14 diffutil, |
15 encoding, | 15 encoding, |
16 node as nodemod, | 16 node as nodemod, |
17 phases, | 17 phases, |
18 pycompat, | |
18 util, | 19 util, |
19 ) | 20 ) |
20 from .utils import dateutil | 21 from .utils import dateutil |
21 | 22 |
22 ### obsolescence marker flag | 23 ### obsolescence marker flag |
981 # we already know the latest base for this divergency | 982 # we already know the latest base for this divergency |
982 continue | 983 continue |
983 base[tuple(nsuccset)] = n | 984 base[tuple(nsuccset)] = n |
984 return [ | 985 return [ |
985 {b'divergentnodes': divset, b'commonpredecessor': b} | 986 {b'divergentnodes': divset, b'commonpredecessor': b} |
986 for divset, b in base.iteritems() | 987 for divset, b in pycompat.iteritems(base) |
987 ] | 988 ] |
988 | 989 |
989 | 990 |
990 def whyunstable(repo, ctx): | 991 def whyunstable(repo, ctx): |
991 result = [] | 992 result = [] |