comparison mercurial/util.py @ 9495:b2d65ee49a72

ui: guard against UnicodeDecodeErrors in ui.wrap

9480:44758742ad2e

def wrap(line, hangindent, width=78):
    padding = '\n' + ' ' * hangindent
    # To avoid corrupting multi-byte characters in line, we must wrap
    # a Unicode string instead of a bytestring.
    u = line.decode(encoding.encoding)
    w = padding.join(textwrap.wrap(u, width=width - hangindent))
    return w.encode(encoding.encoding)

def iterlines(iterator):
    for chunk in iterator:
        for line in chunk.splitlines():
            yield line

9495:b2d65ee49a72

def wrap(line, hangindent, width=78):
    padding = '\n' + ' ' * hangindent
    # To avoid corrupting multi-byte characters in line, we must wrap
    # a Unicode string instead of a bytestring.
    try:
        u = line.decode(encoding.encoding)
        w = padding.join(textwrap.wrap(u, width=width - hangindent))
        return w.encode(encoding.encoding)
    except UnicodeDecodeError:
        return padding.join(textwrap.wrap(line, width=width - hangindent))

def iterlines(iterator):
    for chunk in iterator:
        for line in chunk.splitlines():
            yield line