--- a/mercurial/hgweb/wsgicgi.py Sat Mar 24 13:38:04 2018 +0900
+++ b/mercurial/hgweb/wsgicgi.py Sat Mar 24 15:09:33 2018 +0900
@@ -15,13 +15,17 @@
util,
)
+from ..utils import (
+ procutil,
+)
+
from . import (
common,
)
def launch(application):
- util.setbinary(util.stdin)
- util.setbinary(util.stdout)
+ util.setbinary(procutil.stdin)
+ util.setbinary(procutil.stdout)
environ = dict(encoding.environ.iteritems())
environ.setdefault(r'PATH_INFO', '')
@@ -31,12 +35,12 @@
if environ[r'PATH_INFO'].startswith(scriptname):
environ[r'PATH_INFO'] = environ[r'PATH_INFO'][len(scriptname):]
- stdin = util.stdin
+ stdin = procutil.stdin
if environ.get(r'HTTP_EXPECT', r'').lower() == r'100-continue':
- stdin = common.continuereader(stdin, util.stdout.write)
+ stdin = common.continuereader(stdin, procutil.stdout.write)
environ[r'wsgi.input'] = stdin
- environ[r'wsgi.errors'] = util.stderr
+ environ[r'wsgi.errors'] = procutil.stderr
environ[r'wsgi.version'] = (1, 0)
environ[r'wsgi.multithread'] = False
environ[r'wsgi.multiprocess'] = True
@@ -49,7 +53,7 @@
headers_set = []
headers_sent = []
- out = util.stdout
+ out = procutil.stdout
def write(data):
if not headers_set: