Mercurial > hg-stable
changeset 27045:eac72c1e1e0d
hgweb: import wsgicgi at top level
There should be no practical reason to delay the import of wsgicgi.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 01 Nov 2015 15:09:35 +0900 |
| parents | 1dde4914fb6c |
| children | 37fcfe52c68c |
| files | mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Sun Nov 01 15:07:08 2015 +0900 +++ b/mercurial/hgweb/hgweb_mod.py Sun Nov 01 15:09:35 2015 +0900 @@ -15,7 +15,7 @@ from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST from common import HTTP_NOT_FOUND, HTTP_SERVER_ERROR from request import wsgirequest -import webcommands, protocol, webutil +import webcommands, protocol, webutil, wsgicgi perms = { 'changegroup': 'pull', @@ -261,7 +261,6 @@ if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."): raise RuntimeError("This function is only intended to be " "called while running as a CGI script.") - import mercurial.hgweb.wsgicgi as wsgicgi wsgicgi.launch(self) def __call__(self, env, respond):
--- a/mercurial/hgweb/hgwebdir_mod.py Sun Nov 01 15:07:08 2015 +0900 +++ b/mercurial/hgweb/hgwebdir_mod.py Sun Nov 01 15:09:35 2015 +0900 @@ -15,7 +15,7 @@ get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR import hgweb_mod from request import wsgirequest -import webutil +import webutil, wsgicgi def cleannames(items): return [(util.pconvert(name).strip('/'), path) for name, path in items] @@ -162,7 +162,6 @@ if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."): raise RuntimeError("This function is only intended to be " "called while running as a CGI script.") - import mercurial.hgweb.wsgicgi as wsgicgi wsgicgi.launch(self) def __call__(self, env, respond):