# HG changeset patch # User Martin von Zweigbergk # Date 1595306008 25200 # Node ID 215f08c8006c25b3cb2d0d3bc46e856b15c81458 # Parent dfb67cd1da7f14e277bec26c0d8d259bffe002d2 templatespec: move check for non-unicode to lower-level function Now that we have the factory functions, it makes sense to have the check there. Differential Revision: https://phab.mercurial-scm.org/D8847 diff -r dfb67cd1da7f -r 215f08c8006c mercurial/formatter.py --- a/mercurial/formatter.py Mon Jul 20 21:32:10 2020 -0700 +++ b/mercurial/formatter.py Mon Jul 20 21:33:28 2020 -0700 @@ -551,6 +551,8 @@ def literal_templatespec(tmpl): + if pycompat.ispy3: + assert not isinstance(tmpl, str), b'tmpl must not be a str' return templatespec(b'', tmpl, None) diff -r dfb67cd1da7f -r 215f08c8006c mercurial/logcmdutil.py --- a/mercurial/logcmdutil.py Mon Jul 20 21:32:10 2020 -0700 +++ b/mercurial/logcmdutil.py Mon Jul 20 21:33:28 2020 -0700 @@ -607,8 +607,6 @@ if mapfile: return formatter.mapfile_templatespec(b'changeset', mapfile) else: - if pycompat.ispy3: - assert not isinstance(tmpl, str), b'tmpl must not be a str' return formatter.literal_templatespec(tmpl)