Mercurial > hg
comparison mercurial/templatefuncs.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 | fa246ada356b |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
89 raise error.ParseError(_(b"duplicated dict key '%s' inferred") % k) | 89 raise error.ParseError(_(b"duplicated dict key '%s' inferred") % k) |
90 data[k] = evalfuncarg(context, mapping, v) | 90 data[k] = evalfuncarg(context, mapping, v) |
91 | 91 |
92 data.update( | 92 data.update( |
93 (k, evalfuncarg(context, mapping, v)) | 93 (k, evalfuncarg(context, mapping, v)) |
94 for k, v in args[b'kwargs'].iteritems() | 94 for k, v in pycompat.iteritems(args[b'kwargs']) |
95 ) | 95 ) |
96 return templateutil.hybriddict(data) | 96 return templateutil.hybriddict(data) |
97 | 97 |
98 | 98 |
99 @templatefunc( | 99 @templatefunc( |
872 | 872 |
873 | 873 |
874 def loadfunction(ui, extname, registrarobj): | 874 def loadfunction(ui, extname, registrarobj): |
875 """Load template function from specified registrarobj | 875 """Load template function from specified registrarobj |
876 """ | 876 """ |
877 for name, func in registrarobj._table.iteritems(): | 877 for name, func in pycompat.iteritems(registrarobj._table): |
878 funcs[name] = func | 878 funcs[name] = func |
879 | 879 |
880 | 880 |
881 # tell hggettext to extract docstrings from these functions: | 881 # tell hggettext to extract docstrings from these functions: |
882 i18nfunctions = funcs.values() | 882 i18nfunctions = funcs.values() |