Patchwork [2,of,3,V2] py3: convert kwargs' keys to str using pycompat.strkwargs

login
register
mail settings
Submitter Pulkit Goyal
Date May 15, 2017, 5:50 p.m.
Message ID <75245b989dd661164041.1494870647@workspace>
Download mbox | patch
Permalink /patch/20629/
State Accepted
Headers show

Comments

Pulkit Goyal - May 15, 2017, 5:50 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1493837661 -19800
#      Thu May 04 00:24:21 2017 +0530
# Node ID 75245b989dd661164041794620770ad7726fe9cd
# Parent  d186d8361d0526413dd1399e92ccdb40f3ca2056
py3: convert kwargs' keys to str using pycompat.strkwargs
via Mercurial-devel - May 16, 2017, 3:37 p.m.
On Mon, May 15, 2017 at 10:50 AM, Pulkit Goyal <7895pulkit@gmail.com> wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1493837661 -19800
> #      Thu May 04 00:24:21 2017 +0530
> # Node ID 75245b989dd661164041794620770ad7726fe9cd
> # Parent  d186d8361d0526413dd1399e92ccdb40f3ca2056
> py3: convert kwargs' keys to str using pycompat.strkwargs
>
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -1496,6 +1496,7 @@
>          props['index'] = next(self._counter)
>          props['revcache'] = {'copies': copies}
>          props['cache'] = self.cache
> +        props = pycompat.strkwargs(props)
>
>          # write header
>          if self._parts['header']:
> @@ -1515,7 +1516,7 @@
>          if self._parts['footer']:
>              if not self.footer:
>                  self.footer = templater.stringify(
> -                    self.t(self._parts['footer'], **props))
> +                                    self.t(self._parts['footer'], **props))

I don't see a reason for this change, so I'm reverting it in flight.

>
>  def gettemplate(ui, tmpl, style):
>      """
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - May 16, 2017, 3:50 p.m.
On Tue, 16 May 2017 08:37:32 -0700, Martin von Zweigbergk via Mercurial-devel wrote:
> On Mon, May 15, 2017 at 10:50 AM, Pulkit Goyal <7895pulkit@gmail.com> wrote:
> > # HG changeset patch
> > # User Pulkit Goyal <7895pulkit@gmail.com>
> > # Date 1493837661 -19800
> > #      Thu May 04 00:24:21 2017 +0530
> > # Node ID 75245b989dd661164041794620770ad7726fe9cd
> > # Parent  d186d8361d0526413dd1399e92ccdb40f3ca2056
> > py3: convert kwargs' keys to str using pycompat.strkwargs
> >
> > diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> > --- a/mercurial/cmdutil.py
> > +++ b/mercurial/cmdutil.py
> > @@ -1496,6 +1496,7 @@
> >          props['index'] = next(self._counter)
> >          props['revcache'] = {'copies': copies}
> >          props['cache'] = self.cache
> > +        props = pycompat.strkwargs(props)
> >
> >          # write header
> >          if self._parts['header']:
> > @@ -1515,7 +1516,7 @@
> >          if self._parts['footer']:
> >              if not self.footer:
> >                  self.footer = templater.stringify(
> > -                    self.t(self._parts['footer'], **props))
> > +                                    self.t(self._parts['footer'], **props))
> 
> I don't see a reason for this change, so I'm reverting it in flight.

You beat me. :)

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1496,6 +1496,7 @@ 
         props['index'] = next(self._counter)
         props['revcache'] = {'copies': copies}
         props['cache'] = self.cache
+        props = pycompat.strkwargs(props)
 
         # write header
         if self._parts['header']:
@@ -1515,7 +1516,7 @@ 
         if self._parts['footer']:
             if not self.footer:
                 self.footer = templater.stringify(
-                    self.t(self._parts['footer'], **props))
+                                    self.t(self._parts['footer'], **props))
 
 def gettemplate(ui, tmpl, style):
     """