This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2260

py3: add b'' to make sure regex pattern are bytes in hgweb/webutil.py
ClosedPublic

Authored by pulkit on Feb 14 2018, 6:25 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG44a519ec5077: py3: add b'' to make sure regex pattern are bytes in hgweb/webutil.py
Summary
  1. skip-blame because we are just adding b'' prefixes

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 14 2018, 6:25 AM
Closed by commit rHG44a519ec5077: py3: add b'' to make sure regex pattern are bytes in hgweb/webutil.py (authored by pulkit). · Explain WhyFeb 14 2018, 8:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5715

mercurial/hgweb/webutil.py

# grab the delimiter from the character after the "s" # grab the delimiter from the character after the "s"
unesc = pattern[1:2] unesc = pattern[1:2]
delim = re.escape(unesc) delim = re.escape(unesc)
# identify portions of the pattern, taking care to avoid escaped # identify portions of the pattern, taking care to avoid escaped
# delimiters. the replace format and flags are optional, but # delimiters. the replace format and flags are optional, but
# delimiters are required. # delimiters are required.
match = re.match( match = re.match(
r'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$' br'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$'
% (delim, delim, delim), pattern) % (delim, delim, delim), pattern)
if not match: if not match:
repo.ui.warn(_("websub: invalid pattern for %s: %s\n") repo.ui.warn(_("websub: invalid pattern for %s: %s\n")
% (key, pattern)) % (key, pattern))
continue continue
# we need to unescape the delimiter for regexp and format # we need to unescape the delimiter for regexp and format
delim_re = re.compile(r'(?<!\\)\\%s' % delim) delim_re = re.compile(br'(?<!\\)\\%s' % delim)
regexp = delim_re.sub(unesc, match.group(1)) regexp = delim_re.sub(unesc, match.group(1))
format = delim_re.sub(unesc, match.group(2)) format = delim_re.sub(unesc, match.group(2))
# the pattern allows for 6 regexp flags, so set them if necessary # the pattern allows for 6 regexp flags, so set them if necessary
flagin = match.group(3) flagin = match.group(3)
flags = 0 flags = 0
if flagin: if flagin:
for flag in flagin.upper(): for flag in flagin.upper():