Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hgweb/hgwebdir_mod.py @ 36992:de117f579431

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: factor out helper that renders named template as string This is quite common in non-web templating, and **kwargs expansion is annoying because of the unicode-ness of Python3.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 16 Mar 2018 21:24:12 +0900
parents c479692690ef
children c97b936d8bb5
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py	Sat Mar 17 11:23:04 2018 +0900
+++ b/mercurial/hgweb/hgwebdir_mod.py	Fri Mar 16 21:24:12 2018 +0900
@@ -35,7 +35,6 @@
     pycompat,
     scmutil,
     templater,
-    templateutil,
     ui as uimod,
     util,
 )
@@ -381,8 +380,7 @@
 
             virtual = req.dispatchpath.strip('/')
             tmpl = self.templater(req, nonce)
-            ctype = tmpl('mimetype', encoding=encoding.encoding)
-            ctype = templateutil.stringify(ctype)
+            ctype = tmpl.render('mimetype', {'encoding': encoding.encoding})
 
             # Global defaults. These can be overridden by any handler.
             res.status = '200 Script output follows'