Mercurial > public > mercurial-scm > hg
comparison mercurial/templatefilters.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 | e8cf9ad52a78 |
children | 91c746a77fa3 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
339 ) | 339 ) |
340 elif util.safehasattr(obj, b'keys'): | 340 elif util.safehasattr(obj, b'keys'): |
341 out = [ | 341 out = [ |
342 b'"%s": %s' | 342 b'"%s": %s' |
343 % (encoding.jsonescape(k, paranoid=paranoid), json(v, paranoid)) | 343 % (encoding.jsonescape(k, paranoid=paranoid), json(v, paranoid)) |
344 for k, v in sorted(obj.iteritems()) | 344 for k, v in sorted(pycompat.iteritems(obj)) |
345 ] | 345 ] |
346 return b'{' + b', '.join(out) + b'}' | 346 return b'{' + b', '.join(out) + b'}' |
347 elif util.safehasattr(obj, b'__iter__'): | 347 elif util.safehasattr(obj, b'__iter__'): |
348 out = [json(i, paranoid) for i in obj] | 348 out = [json(i, paranoid) for i in obj] |
349 return b'[' + b', '.join(out) + b']' | 349 return b'[' + b', '.join(out) + b']' |
542 | 542 |
543 | 543 |
544 def loadfilter(ui, extname, registrarobj): | 544 def loadfilter(ui, extname, registrarobj): |
545 """Load template filter from specified registrarobj | 545 """Load template filter from specified registrarobj |
546 """ | 546 """ |
547 for name, func in registrarobj._table.iteritems(): | 547 for name, func in pycompat.iteritems(registrarobj._table): |
548 filters[name] = func | 548 filters[name] = func |
549 | 549 |
550 | 550 |
551 # tell hggettext to extract docstrings from these functions: | 551 # tell hggettext to extract docstrings from these functions: |
552 i18nfunctions = filters.values() | 552 i18nfunctions = filters.values() |