##// END OF EJS Templates
hgweb: import wsgicgi at top level...
Yuya Nishihara -
r27045:eac72c1e default
parent child Browse files
Show More
@@ -15,7 +15,7 b' from common import ErrorResponse, permho'
15 from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST
15 from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST
16 from common import HTTP_NOT_FOUND, HTTP_SERVER_ERROR
16 from common import HTTP_NOT_FOUND, HTTP_SERVER_ERROR
17 from request import wsgirequest
17 from request import wsgirequest
18 import webcommands, protocol, webutil
18 import webcommands, protocol, webutil, wsgicgi
19
19
20 perms = {
20 perms = {
21 'changegroup': 'pull',
21 'changegroup': 'pull',
@@ -261,7 +261,6 b' class hgweb(object):'
261 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
261 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
262 raise RuntimeError("This function is only intended to be "
262 raise RuntimeError("This function is only intended to be "
263 "called while running as a CGI script.")
263 "called while running as a CGI script.")
264 import mercurial.hgweb.wsgicgi as wsgicgi
265 wsgicgi.launch(self)
264 wsgicgi.launch(self)
266
265
267 def __call__(self, env, respond):
266 def __call__(self, env, respond):
@@ -15,7 +15,7 b' from common import ErrorResponse, get_mt'
15 get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
15 get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
16 import hgweb_mod
16 import hgweb_mod
17 from request import wsgirequest
17 from request import wsgirequest
18 import webutil
18 import webutil, wsgicgi
19
19
20 def cleannames(items):
20 def cleannames(items):
21 return [(util.pconvert(name).strip('/'), path) for name, path in items]
21 return [(util.pconvert(name).strip('/'), path) for name, path in items]
@@ -162,7 +162,6 b' class hgwebdir(object):'
162 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
162 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
163 raise RuntimeError("This function is only intended to be "
163 raise RuntimeError("This function is only intended to be "
164 "called while running as a CGI script.")
164 "called while running as a CGI script.")
165 import mercurial.hgweb.wsgicgi as wsgicgi
166 wsgicgi.launch(self)
165 wsgicgi.launch(self)
167
166
168 def __call__(self, env, respond):
167 def __call__(self, env, respond):
General Comments 0
You need to be logged in to leave comments. Login now