Patchwork D2554: templatekw: fix dict construction in _showlist to not mix bytes and strs

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 4:18 p.m.
Message ID <3a1e74f2e1bd85b9453db7d59527112f@localhost.localdomain>
Download mbox | patch
Permalink /patch/28699/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 4:18 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG45f149bf08d1: templatekw: fix dict construction in _showlist to not mix bytes and strs (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2554?vs=6350&id=6363

REVISION DETAIL
  https://phab.mercurial-scm.org/D2554

AFFECTED FILES
  mercurial/templatekw.py

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -205,7 +205,9 @@ 
             yield separator.join(values)
         else:
             for v in values:
-                yield dict(v, **strmapping)
+                r = dict(v)
+                r.update(mapping)
+                yield r
         return
     startname = 'start_' + plural
     if startname in templ: