comparison mercurial/templatefilters.py @ 32128:c3342c177211

py3: replace str with bytes in isinstance()

32127:964e7427a691

        return 'false'
    elif obj is True:
        return 'true'
    elif isinstance(obj, (int, long, float)):
        return pycompat.bytestr(obj)
    elif isinstance(obj, str):
        return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
    elif util.safehasattr(obj, 'keys'):
        out = ['%s: %s' % (json(k), json(v))
               for k, v in sorted(obj.iteritems())]
        return '{' + ', '.join(out) + '}'

def stringify(thing):
    """Any type. Turns the value into text by converting values into
    text and concatenating them.
    """
    thing = templatekw.unwraphybrid(thing)
    if util.safehasattr(thing, '__iter__') and not isinstance(thing, str):
        return "".join([stringify(t) for t in thing if t is not None])
    if thing is None:
        return ""
    return pycompat.bytestr(thing)

32128:c3342c177211

        return 'false'
    elif obj is True:
        return 'true'
    elif isinstance(obj, (int, long, float)):
        return pycompat.bytestr(obj)
    elif isinstance(obj, bytes):
        return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
    elif util.safehasattr(obj, 'keys'):
        out = ['%s: %s' % (json(k), json(v))
               for k, v in sorted(obj.iteritems())]
        return '{' + ', '.join(out) + '}'

def stringify(thing):
    """Any type. Turns the value into text by converting values into
    text and concatenating them.
    """
    thing = templatekw.unwraphybrid(thing)
    if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):
        return "".join([stringify(t) for t in thing if t is not None])
    if thing is None:
        return ""
    return pycompat.bytestr(thing)