Patchwork [3,of,3] py3: make keys of keyword arguments strings

login
register
mail settings
Submitter Pulkit Goyal
Date Dec. 9, 2016, 11:40 p.m.
Message ID <28203092739274efcb8c.1481326827@pulkit-goyal>
Download mbox | patch
Permalink /patch/17889/
State Accepted
Headers show

Comments

Pulkit Goyal - Dec. 9, 2016, 11:40 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1481085372 -19800
#      Wed Dec 07 10:06:12 2016 +0530
# Node ID 28203092739274efcb8c691beb9c4025a2c45ff5
# Parent  7fcea54acba98b7f1d994bd7311bb0f5ec566b65
py3: make keys of keyword arguments strings

keys of keyword arguments on Python 3 has to be string. We are dealing with
bytes in our codebase so the keys are also bytes. We need to convert the keys
to unicodes to make the code run. We have to also reverse this process so that
functions on args dictionary like get() etc. don't result in key not found.

Also after this patch, `hg version` now runs on Python 3.5. Hurray!
Yuya Nishihara - Dec. 11, 2016, 1:39 p.m.
On Sat, 10 Dec 2016 05:10:27 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1481085372 -19800
> #      Wed Dec 07 10:06:12 2016 +0530
> # Node ID 28203092739274efcb8c691beb9c4025a2c45ff5
> # Parent  7fcea54acba98b7f1d994bd7311bb0f5ec566b65
> py3: make keys of keyword arguments strings
> 
> keys of keyword arguments on Python 3 has to be string. We are dealing with
> bytes in our codebase so the keys are also bytes. We need to convert the keys
> to unicodes to make the code run. We have to also reverse this process so that
> functions on args dictionary like get() etc. don't result in key not found.
> 
> Also after this patch, `hg version` now runs on Python 3.5. Hurray!
> 
> diff -r 7fcea54acba9 -r 282030927392 mercurial/dispatch.py
> --- a/mercurial/dispatch.py	Wed Dec 07 21:53:03 2016 +0530
> +++ b/mercurial/dispatch.py	Wed Dec 07 10:06:12 2016 +0530
> @@ -803,6 +803,7 @@
>  
>          msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
>          ui.log("command", '%s\n', msg)
> +        cmdoptions = pycompat.strkwargs(cmdoptions)
>          d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
>          try:
>              return runcommand(lui, repo, cmd, fullargs, ui, options, d,

'cmdoptions' is passed to another function as a normal dict, which shouldn't
be a dict of unicode keys. Only **cmdoptions should be a unicode-key dict.

Sorry I didn't notice it in earlier series.
Pulkit Goyal - Dec. 11, 2016, 2:48 p.m.
> 'cmdoptions' is passed to another function as a normal dict, which shouldn't
> be a dict of unicode keys. Only **cmdoptions should be a unicode-key dict.
>
> Sorry I didn't notice it in earlier series.

No problem, I will send a V6.

Patch

diff -r 7fcea54acba9 -r 282030927392 mercurial/dispatch.py
--- a/mercurial/dispatch.py	Wed Dec 07 21:53:03 2016 +0530
+++ b/mercurial/dispatch.py	Wed Dec 07 10:06:12 2016 +0530
@@ -803,6 +803,7 @@ 
 
         msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
         ui.log("command", '%s\n', msg)
+        cmdoptions = pycompat.strkwargs(cmdoptions)
         d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
         try:
             return runcommand(lui, repo, cmd, fullargs, ui, options, d,
diff -r 7fcea54acba9 -r 282030927392 tests/test-check-py3-commands.t
--- a/tests/test-check-py3-commands.t	Wed Dec 07 21:53:03 2016 +0530
+++ b/tests/test-check-py3-commands.t	Wed Dec 07 10:06:12 2016 +0530
@@ -9,6 +9,6 @@ 
   >   $PYTHON3 `which hg` $cmd 2>&1 2>&1 | tail -1
   > done
   version
-  TypeError: Can't convert 'bytes' object to str implicitly
+  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   debuginstall
   TypeError: Can't convert 'bytes' object to str implicitly