D3367: hgwebdir: un-bytes the env dict before re-parsing env
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Sat Apr 14 11:09:07 EDT 2018
durin42 updated this revision to Diff 8277.
Herald added a reviewer: pulkit.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3367?vs=8275&id=8277
REVISION DETAIL
https://phab.mercurial-scm.org/D3367
AFFECTED FILES
contrib/python3-whitelist
mercurial/hgweb/hgwebdir_mod.py
CHANGE DETAILS
diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -422,8 +422,12 @@
if real:
# Re-parse the WSGI environment to take into account our
# repository path component.
+ uenv = req.rawenv
+ if pycompat.ispy3:
+ uenv = {k.decode('latin1'): v for k, v in
+ uenv.iteritems()}
req = requestmod.parserequestfromenv(
- req.rawenv, reponame=virtualrepo,
+ uenv, reponame=virtualrepo,
altbaseurl=self.ui.config('web', 'baseurl'))
try:
# ensure caller gets private copy of ui
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -153,6 +153,7 @@
test-glog-topological.t
test-gpg.t
test-graft.t
+test-hg-parseurl.py
test-hghave.t
test-hgignore.t
test-hgk.t
To: durin42, #hg-reviewers, yuja, pulkit
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list