# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1444344262 18000
# Node ID bed9e6c706f6963682d0b59a0b89bbf3a7f12af0
# Parent  d4a1bfe1de63f6b781a8ca50dd0ac5169b5161fe# Parent  d3712209921d2598a59af262cab4f0726ae25a5e
merge with stable

diff -r d4a1bfe1de63 -r bed9e6c706f6 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):