changeset 33016:4e6dc34b5d7a

py3: convert kwargs keys' back to bytes using pycompat.byteskwargs()
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 22 Jun 2017 03:10:24 +0530
parents f66be4caeaab
children c31d45623304
files mercurial/exchange.py mercurial/templater.py
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu Jun 22 01:29:07 2017 +0530
+++ b/mercurial/exchange.py	Thu Jun 22 03:10:24 2017 +0530
@@ -1582,6 +1582,7 @@
 
     Returns an iterator over raw chunks (of varying sizes).
     """
+    kwargs = pycompat.byteskwargs(kwargs)
     usebundle2 = bundle2requested(bundlecaps)
     # bundle10 case
     if not usebundle2:
--- a/mercurial/templater.py	Thu Jun 22 01:29:07 2017 +0530
+++ b/mercurial/templater.py	Thu Jun 22 03:10:24 2017 +0530
@@ -1303,6 +1303,7 @@
         return stringify(self('', **mapping))
 
     def __call__(self, t, **mapping):
+        mapping = pycompat.byteskwargs(mapping)
         ttype = t in self.map and self.map[t][0] or 'default'
         if ttype not in self.ecache:
             try: