This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2553

templatefilters: avoid infinite recursion bug in stringify
ClosedPublic

Authored by durin42 on Mar 2 2018, 9:50 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9b6b02a5b589: templatefilters: avoid infinite recursion bug in stringify
Summary

This doesn't ever happen on Python 2, but it's been a persistent pain
on Python 3. Adding this helped produce some of my upcoming Python 3
fixes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/templatefilters.py (6 lines)

Diff 6362

mercurial/templatefilters.py

@templatefilter('stringify') @templatefilter('stringify')
def stringify(thing): def stringify(thing):
"""Any type. Turns the value into text by converting values into """Any type. Turns the value into text by converting values into
text and concatenating them. text and concatenating them.
""" """
thing = templatekw.unwraphybrid(thing) thing = templatekw.unwraphybrid(thing)
if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes): if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):
if isinstance(thing, str):
# This is only reachable on Python 3 (otherwise
# isinstance(thing, bytes) would have been true), and is
# here to prevent infinite recursion bugs on Python 3.
raise error.ProgrammingError(
'stringify got unexpected unicode string: %r' % thing)
return "".join([stringify(t) for t in thing if t is not None]) return "".join([stringify(t) for t in thing if t is not None])
if thing is None: if thing is None:
return "" return ""
return pycompat.bytestr(thing) return pycompat.bytestr(thing)
@templatefilter('stripdir') @templatefilter('stripdir')
def stripdir(text): def stripdir(text):
"""Treat the text as path and strip a directory level, if """Treat the text as path and strip a directory level, if