merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 08 Oct 2015 17:44:22 -0500
changeset 26564 bed9e6c706f6
parent 26563 d4a1bfe1de63 (current diff)
parent 26535 d3712209921d (diff)
child 26565 ee1bcb9aa6e4
merge with stable
mercurial/templater.py
--- a/mercurial/templater.py	Thu Oct 01 23:13:57 2015 -0700
+++ b/mercurial/templater.py	Thu Oct 08 17:44:22 2015 -0500
@@ -237,8 +237,6 @@
             v = ''
     if callable(v):
         return v(**mapping)
-    if isinstance(v, types.GeneratorType):
-        v = list(v)
     return v
 
 def buildtemplate(exp, context):