# HG changeset patch # User Yuya Nishihara # Date 1446354014 -32400 # Node ID 7f19f331ef596ffa12b4053162d4c0afb9e0d187 # Parent c8cbef0736457af895721ffbc09e60e98a5c772c hgweb: do not import templatefilters.revescape and websub as symbol It will be enforced by the import checker. diff -r c8cbef073645 -r 7f19f331ef59 mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Sun Nov 01 13:58:32 2015 +0900 +++ b/mercurial/hgweb/hgweb_mod.py Sun Nov 01 14:00:14 2015 +0900 @@ -10,7 +10,7 @@ import os from mercurial import hg, hook, error, encoding, templater, util, repoview from mercurial import ui as uimod -from mercurial.templatefilters import websub +from mercurial import templatefilters from common import ErrorResponse, permhooks, caching from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST from common import HTTP_NOT_FOUND, HTTP_SERVER_ERROR @@ -159,7 +159,7 @@ or req.url.strip('/') or self.repo.root) def websubfilter(text): - return websub(text, self.websubtable) + return templatefilters.websub(text, self.websubtable) # create the templater diff -r c8cbef073645 -r 7f19f331ef59 mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Sun Nov 01 13:58:32 2015 +0900 +++ b/mercurial/hgweb/webutil.py Sun Nov 01 14:00:14 2015 +0900 @@ -12,7 +12,7 @@ from mercurial import ui as uimod from mercurial.i18n import _ from mercurial.node import hex, nullid, short -from mercurial.templatefilters import revescape +from mercurial import templatefilters from common import ErrorResponse, paritygen from common import HTTP_NOT_FOUND import difflib @@ -315,7 +315,7 @@ def symrevorshortnode(req, ctx): if 'node' in req.form: - return revescape(req.form['node'][0]) + return templatefilters.revescape(req.form['node'][0]) else: return short(ctx.node())