( )⚙ D1067 python3: use our bytes-only version of cgi.escape everywhere

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1067

python3: use our bytes-only version of cgi.escape everywhere
ClosedPublic

Authored by durin42 on Oct 14 2017, 3:03 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGe178fcaa3933: python3: use our bytes-only version of cgi.escape everywhere
Summary

As suggested by Yuya in D965.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 14 2017, 3:03 AM
yuja accepted this revision.Oct 14 2017, 7:28 AM
This revision is now accepted and ready to land.Oct 14 2017, 7:28 AM
Closed by commit rHGe178fcaa3933: python3: use our bytes-only version of cgi.escape everywhere (authored by durin42). · Explain WhyOct 14 2017, 7:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2724

mercurial/hgweb/webcommands.py

# #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import cgi
import copy import copy
import mimetypes import mimetypes
import os import os
import re import re
from ..i18n import _ from ..i18n import _
from ..node import hex, short from ..node import hex, short
error, error,
graphmod, graphmod,
revset, revset,
revsetlang, revsetlang,
scmutil, scmutil,
smartset, smartset,
templatefilters, templatefilters,
templater, templater,
url,
util, util,
) )
from . import ( from . import (
webutil, webutil,
) )
__all__ = [] __all__ = []
row = 0 row = 0
for (id, type, ctx, vtx, edges) in tree: for (id, type, ctx, vtx, edges) in tree:
if type != graphmod.CHANGESET: if type != graphmod.CHANGESET:
continue continue
node = str(ctx) node = str(ctx)
age = encodestr(templatefilters.age(ctx.date())) age = encodestr(templatefilters.age(ctx.date()))
desc = templatefilters.firstline(encodestr(ctx.description())) desc = templatefilters.firstline(encodestr(ctx.description()))
desc = cgi.escape(templatefilters.nonempty(desc)) desc = url.escape(templatefilters.nonempty(desc))
user = cgi.escape(templatefilters.person(encodestr(ctx.user()))) user = url.escape(templatefilters.person(encodestr(ctx.user())))
branch = cgi.escape(encodestr(ctx.branch())) branch = url.escape(encodestr(ctx.branch()))
try: try:
branchnode = web.repo.branchtip(branch) branchnode = web.repo.branchtip(branch)
except error.RepoLookupError: except error.RepoLookupError:
branchnode = None branchnode = None
branch = branch, branchnode == ctx.node() branch = branch, branchnode == ctx.node()
if usetuples: if usetuples:
data.append((node, vtx, edges, desc, user, age, branch, data.append((node, vtx, edges, desc, user, age, branch,
[cgi.escape(encodestr(x)) for x in ctx.tags()], [url.escape(encodestr(x)) for x in ctx.tags()],
[cgi.escape(encodestr(x)) [url.escape(encodestr(x))
for x in ctx.bookmarks()])) for x in ctx.bookmarks()]))
else: else:
edgedata = [{'col': edge[0], 'nextcol': edge[1], edgedata = [{'col': edge[0], 'nextcol': edge[1],
'color': (edge[2] - 1) % 6 + 1, 'color': (edge[2] - 1) % 6 + 1,
'width': edge[3], 'bcolor': edge[4]} 'width': edge[3], 'bcolor': edge[4]}
for edge in edges] for edge in edges]
data.append( data.append(

mercurial/minirst.py

on the user to keep the right indentation for the blocks. on the user to keep the right indentation for the blocks.
Remember to update https://mercurial-scm.org/wiki/HelpStyleGuide Remember to update https://mercurial-scm.org/wiki/HelpStyleGuide
when adding support for new constructs. when adding support for new constructs.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import cgi
import re import re
from .i18n import _ from .i18n import _
from . import ( from . import (
encoding, encoding,
pycompat, pycompat,
url,
util, util,
) )
def section(s): def section(s):
return "%s\n%s\n\n" % (s, "\"" * encoding.colwidth(s)) return "%s\n%s\n\n" % (s, "\"" * encoding.colwidth(s))
def subsection(s): def subsection(s):
return "%s\n%s\n\n" % (s, '=' * encoding.colwidth(s)) return "%s\n%s\n\n" % (s, '=' * encoding.colwidth(s))
def formathtml(blocks): def formathtml(blocks):
"""Format RST blocks as HTML""" """Format RST blocks as HTML"""
out = [] out = []
headernest = '' headernest = ''
listnest = [] listnest = []
def escape(s): def escape(s):
return cgi.escape(s, True) return url.escape(s, True)
def openlist(start, level): def openlist(start, level):
if not listnest or listnest[-1][0] != start: if not listnest or listnest[-1][0] != start:
listnest.append((start, level)) listnest.append((start, level))
out.append('<%s>\n' % start) out.append('<%s>\n' % start)
blocks = [b for b in blocks if b['type'] != 'margin'] blocks = [b for b in blocks if b['type'] != 'margin']

mercurial/templatefilters.py

# templatefilters.py - common template expansion filters # templatefilters.py - common template expansion filters
# #
# Copyright 2005-2008 Matt Mackall <mpm@selenic.com> # Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import cgi
import os import os
import re import re
import time import time
from . import ( from . import (
encoding, encoding,
hbisect, hbisect,
node, node,
pycompat, pycompat,
registrar, registrar,
templatekw, templatekw,
url,
util, util,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
if pycompat.ispy3: if pycompat.ispy3:
long = int long = int
""" """
return util.email(text) return util.email(text)
@templatefilter('escape') @templatefilter('escape')
def escape(text): def escape(text):
"""Any text. Replaces the special XML/XHTML characters "&", "<" """Any text. Replaces the special XML/XHTML characters "&", "<"
and ">" with XML entities, and filters out NUL characters. and ">" with XML entities, and filters out NUL characters.
""" """
return cgi.escape(text.replace('\0', ''), True) return url.escape(text.replace('\0', ''), True)
para_re = None para_re = None
space_re = None space_re = None
def fill(text, width, initindent='', hangindent=''): def fill(text, width, initindent='', hangindent=''):
'''fill many paragraphs with optional indentation.''' '''fill many paragraphs with optional indentation.'''
global para_re, space_re global para_re, space_re
if para_re is None: if para_re is None: