--- a/mercurial/templater.py Mon Mar 10 01:01:42 2014 +0900
+++ b/mercurial/templater.py Mon Mar 10 01:01:43 2014 +0900
@@ -296,7 +296,7 @@
joiner = " "
if len(args) > 1:
- joiner = args[1][0](context, mapping, args[1][1])
+ joiner = stringify(args[1][0](context, mapping, args[1][1]))
first = True
for x in joinset:
@@ -328,9 +328,9 @@
if not (1 <= len(args) <= 2):
raise error.ParseError(_("strip expects one or two arguments"))
- text = args[0][0](context, mapping, args[0][1])
+ text = stringify(args[0][0](context, mapping, args[0][1]))
if len(args) == 2:
- chars = args[1][0](context, mapping, args[1][1])
+ chars = stringify(args[1][0](context, mapping, args[1][1]))
return text.strip(chars)
return text.strip()