hgweb: fix hgweb_mod as well as hgwebdir_mod

mercurial/hgweb/hgweb_mod.py

@@ -28,7 +28,7 class hgweb(object):
             if baseui:
                 u = baseui.copy()
             else:
-                u = ui.ui()
+                u = webutil.wsgiui()
             self.repo = hg.repository(u, repo)
         else:
             self.repo = repo

mercurial/hgweb/hgwebdir_mod.py

@@ -41,11 +41,6 def findrepos(paths):
             repos.append((name, path))
     return repos
 
-class wsgiui(ui.ui):
-    # default termwidth breaks under mod_wsgi
-    def termwidth(self):
-        return 80
-
 class hgwebdir(object):
     refreshinterval = 20
 
@@ -63,7 +58,7 class hgwebdir(object):
         if self.baseui:
             u = self.baseui.copy()
         else:
-            u = wsgiui()
+            u = webutil.wsgiui()
             u.setconfig('ui', 'report_untrusted', 'off')
             u.setconfig('ui', 'interactive', 'off')
 

mercurial/hgweb/webutil.py

@@ -7,7 +7,7
 # GNU General Public License version 2 or any later version.
 
 import os, copy
-from mercurial import match, patch, util, error
+from mercurial import match, patch, util, error, ui
 from mercurial.node import hex, nullid
 
 def up(p):
@@ -219,3 +219,8 class sessionvars(object):
         for key, value in self.vars.iteritems():
             yield {'name': key, 'value': str(value), 'separator': separator}
             separator = '&'
+
+class wsgiui(ui.ui):
+    # default termwidth breaks under mod_wsgi
+    def termwidth(self):
+        return 80