Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/hgwebdir_mod.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 | 0b7733719d21 6ff1a0d109c9 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
445 # Re-parse the WSGI environment to take into account our | 445 # Re-parse the WSGI environment to take into account our |
446 # repository path component. | 446 # repository path component. |
447 uenv = req.rawenv | 447 uenv = req.rawenv |
448 if pycompat.ispy3: | 448 if pycompat.ispy3: |
449 uenv = { | 449 uenv = { |
450 k.decode('latin1'): v for k, v in uenv.iteritems() | 450 k.decode('latin1'): v |
451 for k, v in pycompat.iteritems(uenv) | |
451 } | 452 } |
452 req = requestmod.parserequestfromenv( | 453 req = requestmod.parserequestfromenv( |
453 uenv, | 454 uenv, |
454 reponame=virtualrepo, | 455 reponame=virtualrepo, |
455 altbaseurl=self.ui.config(b'web', b'baseurl'), | 456 altbaseurl=self.ui.config(b'web', b'baseurl'), |