diff -r 1dde4914fb6c -r eac72c1e1e0d mercurial/hgweb/hgwebdir_mod.py
--- 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):