diff -r a150173da1c1 -r f1c9fafcbf46 mercurial/hgweb/wsgicgi.py
--- a/mercurial/hgweb/wsgicgi.py	Sun Dec 18 01:46:39 2016 +0530
+++ b/mercurial/hgweb/wsgicgi.py	Sun Dec 18 01:54:36 2016 +0530
@@ -10,9 +10,8 @@
 
 from __future__ import absolute_import
 
-import os
-
 from .. import (
+    encoding,
     util,
 )
 
@@ -24,7 +23,7 @@
     util.setbinary(util.stdin)
     util.setbinary(util.stdout)
 
-    environ = dict(os.environ.iteritems())
+    environ = dict(encoding.environ.iteritems())
     environ.setdefault('PATH_INFO', '')
     if environ.get('SERVER_SOFTWARE', '').startswith('Microsoft-IIS'):
         # IIS includes script_name in PATH_INFO