comparison mercurial/templater.py @ 32970:11c0bb4ccc76

py3: replace str with bytes in isinstance()

We were using str because on Python 2, str were bytes but now we have to use
bytes. Otherwise the if conditions fails and we have weird results from commands
on Python 3.

32969:30d0cb279bac

stringify = templatefilters.stringify

def _flatten(thing):
    '''yield a single stream from a possibly nested set of iterators'''
    thing = templatekw.unwraphybrid(thing)
    if isinstance(thing, str):
        yield thing
    elif thing is None:
        pass
    elif not util.safehasattr(thing, '__iter__'):
        yield str(thing)
    else:
        for i in thing:
            i = templatekw.unwraphybrid(i)
            if isinstance(i, str):
                yield i
            elif i is None:
                pass
            elif not util.safehasattr(i, '__iter__'):
                yield str(i)

32970:11c0bb4ccc76

stringify = templatefilters.stringify

def _flatten(thing):
    '''yield a single stream from a possibly nested set of iterators'''
    thing = templatekw.unwraphybrid(thing)
    if isinstance(thing, bytes):
        yield thing
    elif thing is None:
        pass
    elif not util.safehasattr(thing, '__iter__'):
        yield str(thing)
    else:
        for i in thing:
            i = templatekw.unwraphybrid(i)
            if isinstance(i, bytes):
                yield i
            elif i is None:
                pass
            elif not util.safehasattr(i, '__iter__'):
                yield str(i)