comparison mercurial/util.py @ 36629:c98d1c6763a6

util: teach escapedata() about bytearray

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

Differential Revision: https://phab.mercurial-scm.org/D2582

36628:70415568ea65

    b'\n': br'\n',
})
DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]')

def escapedata(s):
    return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s)

class fileobjectobserver(object):
    """Logs file object activity."""
    def __init__(self, fh, name, reads=True, writes=True, logdata=False):

36629:c98d1c6763a6

    b'\n': br'\n',
})
DATA_ESCAPE_RE = remod.compile(br'[\x00-\x08\x0a-\x1f\\\x7f-\xff]')

def escapedata(s):
    if isinstance(s, bytearray):
        s = bytes(s)

    return DATA_ESCAPE_RE.sub(lambda m: DATA_ESCAPE_MAP[m.group(0)], s)

class fileobjectobserver(object):
    """Logs file object activity."""
    def __init__(self, fh, name, reads=True, writes=True, logdata=False):