This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2582

util: teach escapedata() about bytearray
ClosedPublic

Authored by indygreg on Mar 3 2018, 9:52 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc98d1c6763a6: util: teach escapedata() about bytearray
Summary

re.map doesn't seem to know about bytearray (at least in Python 2).
Cast bytearray to a bytes to work around this inconvenience.

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

indygreg created this revision.Mar 3 2018, 9:52 AM
durin42 accepted this revision.Mar 3 2018, 10:14 AM
This revision is now accepted and ready to land.Mar 3 2018, 10:14 AM
Closed by commit rHGc98d1c6763a6: util: teach escapedata() about bytearray (authored by indygreg). · Explain WhyMar 3 2018, 10:22 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (3 lines)

Diff 6430

mercurial/util.py

DATA_ESCAPE_MAP.update({ DATA_ESCAPE_MAP.update({
b'\\': b'\\\\', b'\\': b'\\\\',
b'\r': br'\r', b'\r': br'\r',
b'\n': br'\n', b'\n': br'\n',
}) })
DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]') DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]')
def escapedata(s): def escapedata(s):
if isinstance(s, bytearray):
s = bytes(s)
return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s) return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s)
class fileobjectobserver(object): class fileobjectobserver(object):
"""Logs file object activity.""" """Logs file object activity."""
def __init__(self, fh, name, reads=True, writes=True, logdata=False): def __init__(self, fh, name, reads=True, writes=True, logdata=False):
self.fh = fh self.fh = fh
self.name = name self.name = name
self.logdata = logdata self.logdata = logdata