From patchwork Sun Apr  1 02:46:02 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [5,of,8] templater: drop unneeded generator from mappable object
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 30092
Message-Id: <cc616e233d253af1aeb4.1522550762@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Sun, 01 Apr 2018 11:46:02 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1521287908 -32400
#      Sat Mar 17 20:58:28 2018 +0900
# Node ID cc616e233d253af1aeb4cc2576a38a437c3be95a
# Parent  9a9b1047830a742e914d7085cfd9df34f5577d64
templater: drop unneeded generator from mappable object

Per the definition of the show() interface, it can return a bytes.

diff --git a/mercurial/templateutil.py b/mercurial/templateutil.py
--- a/mercurial/templateutil.py
+++ b/mercurial/templateutil.py
@@ -108,15 +108,11 @@ class mappable(wrapped):
     """
 
     def __init__(self, gen, key, value, makemap):
-        if gen is not None:
-            self._gen = gen  # generator or function returning generator
+        self._gen = gen  # generator or function returning generator
         self._key = key
         self._value = value  # may be generator of strings
         self._makemap = makemap
 
-    def _gen(self):
-        yield pycompat.bytestr(self._value)
-
     def tomap(self):
         return self._makemap(self._key)
 
@@ -126,6 +122,8 @@ class mappable(wrapped):
     def show(self, context):
         # TODO: switch gen to context-based API?
         gen = self._gen
+        if gen is None:
+            return pycompat.bytestr(self._value)
         if callable(gen):
             return gen()
         return gen