diff -r 6f173560c7f4 -r 52e222eef646 mercurial/templater.py
--- a/mercurial/templater.py	Fri May 05 01:26:13 2017 +0530
+++ b/mercurial/templater.py	Fri May 05 01:26:49 2017 +0530
@@ -53,6 +53,7 @@
     """Parse a template expression into a stream of tokens, which must end
     with term if specified"""
     pos = start
+    program = pycompat.bytestr(program)
     while pos < end:
         c = program[pos]
         if c.isspace(): # skip inter-token whitespace