Mercurial > hg > mercurial-source
changeset 37943:888507ec655e
templateutil: move flatten() from templater
It's the same kind of utility as stringify().
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 17 Mar 2018 20:00:54 +0900 |
parents | fb7140f1d09d |
children | e09d2183e226 |
files | mercurial/templater.py mercurial/templateutil.py |
diffstat | 2 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -527,33 +527,6 @@ # template engine -def _flatten(thing): - '''yield a single stream from a possibly nested set of iterators''' - thing = templateutil.unwraphybrid(thing) - if isinstance(thing, bytes): - yield thing - elif isinstance(thing, str): - # We can only hit this on Python 3, and it's here to guard - # against infinite recursion. - raise error.ProgrammingError('Mercurial IO including templates is done' - ' with bytes, not strings, got %r' % thing) - elif thing is None: - pass - elif not util.safehasattr(thing, '__iter__'): - yield pycompat.bytestr(thing) - else: - for i in thing: - i = templateutil.unwraphybrid(i) - if isinstance(i, bytes): - yield i - elif i is None: - pass - elif not util.safehasattr(i, '__iter__'): - yield pycompat.bytestr(i) - else: - for j in _flatten(i): - yield j - def unquotestring(s): '''unwrap quotes if any; otherwise returns unmodified string''' if len(s) < 2 or s[0] not in "'\"" or s[0] != s[-1]: @@ -706,7 +679,7 @@ if extramapping: extramapping.update(mapping) mapping = extramapping - return _flatten(func(self, mapping, data)) + return templateutil.flatten(func(self, mapping, data)) engines = {'default': engine}
--- a/mercurial/templateutil.py +++ b/mercurial/templateutil.py @@ -234,6 +234,33 @@ if context.preload(endname): yield context.process(endname, mapping) +def flatten(thing): + """Yield a single stream from a possibly nested set of iterators""" + thing = unwraphybrid(thing) + if isinstance(thing, bytes): + yield thing + elif isinstance(thing, str): + # We can only hit this on Python 3, and it's here to guard + # against infinite recursion. + raise error.ProgrammingError('Mercurial IO including templates is done' + ' with bytes, not strings, got %r' % thing) + elif thing is None: + pass + elif not util.safehasattr(thing, '__iter__'): + yield pycompat.bytestr(thing) + else: + for i in thing: + i = unwraphybrid(i) + if isinstance(i, bytes): + yield i + elif i is None: + pass + elif not util.safehasattr(i, '__iter__'): + yield pycompat.bytestr(i) + else: + for j in flatten(i): + yield j + def stringify(thing): """Turn values into bytes by converting into text and concatenating them""" thing = unwraphybrid(thing)