( )⚙ D1794 py3: make regular expressions bytes by prepending b''

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1794

py3: make regular expressions bytes by prepending b''
ClosedPublic

Authored by pulkit on Dec 28 2017, 7:49 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG6f62a1c3e11d: py3: make regular expressions bytes by prepending b''
Summary

Regexes start with r'' and hence transformer skips adding b'' there.

  1. skip-blame because we are just adding b''

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.Dec 28 2017, 7:49 PM
durin42 added a subscriber: durin42.Dec 28 2017, 8:52 PM

For patches like this that are just adding bytes prefixes, let's go ahead and do a '# skip-blame' as in d92dc725223bbde09963fc431e57d32a40c4167d (aka D1170) so that blame is cleaner in the future.

pulkit edited the summary of this revision. (Show Details)Dec 29 2017, 1:24 PM
durin42 accepted this revision.Jan 10 2018, 5:56 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:56 PM
Closed by commit rHG6f62a1c3e11d: py3: make regular expressions bytes by prepending b'' (authored by pulkit). · Explain WhyJan 10 2018, 6:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/byterange.py (2 lines)
Mmercurial/mdiff.py (2 lines)

Diff 4777

mercurial/byterange.py

Return () if range_header does not conform to the range spec Return () if range_header does not conform to the range spec
pattern. pattern.
""" """
global _rangere global _rangere
if range_header is None: if range_header is None:
return None return None
if _rangere is None: if _rangere is None:
_rangere = re.compile(r'^bytes=(\d{1,})-(\d*)') _rangere = re.compile(br'^bytes=(\d{1,})-(\d*)')
match = _rangere.match(range_header) match = _rangere.match(range_header)
if match: if match:
tup = range_tuple_normalize(match.group(1, 2)) tup = range_tuple_normalize(match.group(1, 2))
if tup and tup[1]: if tup and tup[1]:
tup = (tup[0], tup[1]+1) tup = (tup[0], tup[1]+1)
return tup return tup
return () return ()

mercurial/mdiff.py

def wsclean(opts, text, blank=True): def wsclean(opts, text, blank=True):
if opts.ignorews: if opts.ignorews:
text = bdiff.fixws(text, 1) text = bdiff.fixws(text, 1)
elif opts.ignorewsamount: elif opts.ignorewsamount:
text = bdiff.fixws(text, 0) text = bdiff.fixws(text, 0)
if blank and opts.ignoreblanklines: if blank and opts.ignoreblanklines:
text = re.sub('\n+', '\n', text).strip('\n') text = re.sub('\n+', '\n', text).strip('\n')
if opts.ignorewseol: if opts.ignorewseol:
text = re.sub(r'[ \t\r\f]+\n', r'\n', text) text = re.sub(br'[ \t\r\f]+\n', r'\n', text)
return text return text
def splitblock(base1, lines1, base2, lines2, opts): def splitblock(base1, lines1, base2, lines2, opts):
# The input lines matches except for interwoven blank lines. We # The input lines matches except for interwoven blank lines. We
# transform it into a sequence of matching blocks and blank blocks. # transform it into a sequence of matching blocks and blank blocks.
lines1 = [(wsclean(opts, l) and 1 or 0) for l in lines1] lines1 = [(wsclean(opts, l) and 1 or 0) for l in lines1]
lines2 = [(wsclean(opts, l) and 1 or 0) for l in lines2] lines2 = [(wsclean(opts, l) and 1 or 0) for l in lines2]
s1, e1 = 0, len(lines1) s1, e1 = 0, len(lines1)