diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py index 839328c5a7286d81f0390ef70aa87fd9ef1f83e2_bWVyY3VyaWFsL2hnd2ViL3JlcXVlc3QucHk=..2632c1ed8f34988fc918d70ccc40b01c20c08a53_bWVyY3VyaWFsL2hnd2ViL3JlcXVlc3QucHk= 100644 --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -12,6 +12,7 @@ from ..thirdparty import attr from .. import ( + encoding, error, pycompat, util, @@ -162,6 +163,7 @@ # strings on Python 3 must be between \00000-\000FF. We deal with bytes # in Mercurial, so mass convert string keys and values to bytes. if pycompat.ispy3: + def tobytes(s): if not isinstance(s, str): return s @@ -165,7 +167,14 @@ def tobytes(s): if not isinstance(s, str): return s - return s.encode('latin-1') + if pycompat.iswindows: + # This is what mercurial.encoding does for os.environ on + # Windows. + return encoding.strtolocal(s) + else: + # This is what is documented to be used for os.environ on Unix. + return pycompat.fsencode(s) + env = {tobytes(k): tobytes(v) for k, v in pycompat.iteritems(env)} # Some hosting solutions are emulating hgwebdir, and dispatching directly diff --git a/tests/test-wsgirequest.py b/tests/test-wsgirequest.py index 839328c5a7286d81f0390ef70aa87fd9ef1f83e2_dGVzdHMvdGVzdC13c2dpcmVxdWVzdC5weQ==..2632c1ed8f34988fc918d70ccc40b01c20c08a53_dGVzdHMvdGVzdC13c2dpcmVxdWVzdC5weQ== 100644 --- a/tests/test-wsgirequest.py +++ b/tests/test-wsgirequest.py @@ -3,7 +3,7 @@ import unittest from mercurial.hgweb import request as requestmod -from mercurial import error +from mercurial import error, pycompat DEFAULT_ENV = { 'REQUEST_METHOD': 'GET', @@ -432,6 +432,18 @@ self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.reponame, b'repo') + def testenvencoding(self): + if pycompat.iswindows: + # On Windows, we can't generally know which non-ASCII characters + # are supported. + r = parse(DEFAULT_ENV, extra={'foo': 'bar'}) + self.assertEqual(r.rawenv[b'foo'], b'bar') + else: + # Unix is byte-based. Therefore we test all possible bytes. + b = b''.join(pycompat.bytechr(i) for i in range(256)) + r = parse(DEFAULT_ENV, extra={'foo': pycompat.fsdecode(b)}) + self.assertEqual(r.rawenv[b'foo'], b) + if __name__ == '__main__': import silenttestrunner