diff -r 317382151ac3 -r de117f579431 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Sat Mar 17 11:23:04 2018 +0900
+++ b/mercurial/hgweb/hgweb_mod.py	Fri Mar 16 21:24:12 2018 +0900
@@ -30,7 +30,6 @@
     repoview,
     templatefilters,
     templater,
-    templateutil,
     ui as uimod,
     util,
     wireprotoserver,
@@ -378,8 +377,8 @@
 
         try:
             rctx.tmpl = rctx.templater(req)
-            ctype = rctx.tmpl('mimetype', encoding=encoding.encoding)
-            ctype = templateutil.stringify(ctype)
+            ctype = rctx.tmpl.render('mimetype',
+                                     {'encoding': encoding.encoding})
 
             # check read permissions non-static content
             if cmd != 'static':