mercurial/templater.py

--- a/mercurial/templater.py	Sun Apr 24 19:15:34 2016 +0900
+++ b/mercurial/templater.py	Tue Apr 04 22:19:02 2017 +0900
@@ -1020,6 +1020,7 @@
 
 def _flatten(thing):
     '''yield a single stream from a possibly nested set of iterators'''
+    thing = templatekw.unwraphybrid(thing)
     if isinstance(thing, str):
         yield thing
     elif thing is None:
@@ -1028,6 +1029,7 @@
         yield str(thing)
     else:
         for i in thing:
+            i = templatekw.unwraphybrid(i)
             if isinstance(i, str):
                 yield i
             elif i is None: