Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/webutil.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 | 66f2cc210a29 |
children | 33cff871d3b9 371765e775a2 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
55 | 55 |
56 def archivelist(ui, nodeid, url=None): | 56 def archivelist(ui, nodeid, url=None): |
57 allowed = ui.configlist(b'web', b'allow-archive', untrusted=True) | 57 allowed = ui.configlist(b'web', b'allow-archive', untrusted=True) |
58 archives = [] | 58 archives = [] |
59 | 59 |
60 for typ, spec in archivespecs.iteritems(): | 60 for typ, spec in pycompat.iteritems(archivespecs): |
61 if typ in allowed or ui.configbool( | 61 if typ in allowed or ui.configbool( |
62 b'web', b'allow' + typ, untrusted=True | 62 b'web', b'allow' + typ, untrusted=True |
63 ): | 63 ): |
64 archives.append( | 64 archives.append( |
65 { | 65 { |
850 # implement if necessary | 850 # implement if necessary |
851 raise error.ParseError(_(b'not filterable')) | 851 raise error.ParseError(_(b'not filterable')) |
852 | 852 |
853 def itermaps(self, context): | 853 def itermaps(self, context): |
854 separator = self._start | 854 separator = self._start |
855 for key, value in sorted(self._vars.iteritems()): | 855 for key, value in sorted(pycompat.iteritems(self._vars)): |
856 yield { | 856 yield { |
857 b'name': key, | 857 b'name': key, |
858 b'value': pycompat.bytestr(value), | 858 b'value': pycompat.bytestr(value), |
859 b'separator': separator, | 859 b'separator': separator, |
860 } | 860 } |