Mercurial > hg-stable
changeset 27008:7f19f331ef59
hgweb: do not import templatefilters.revescape and websub as symbol
It will be enforced by the import checker.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 01 Nov 2015 14:00:14 +0900 |
| parents | c8cbef073645 |
| children | f5faef7e9119 |
| files | mercurial/hgweb/hgweb_mod.py mercurial/hgweb/webutil.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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())