changeset 26564:bed9e6c706f6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Oct 2015 17:44:22 -0500
parents d4a1bfe1de63 (current diff) d3712209921d (diff)
children ee1bcb9aa6e4
files mercurial/templater.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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):