[PATCH V6] py3: make keys of keyword arguments strings

Pulkit Goyal 7895pulkit at gmail.com
Wed Dec 21 17:09:31 EST 2016


> Also after this patch, `hg version` now runs on Python 3.5. Hurray!

I just realised that this may not run for other people who have set up
some aliases in hgrc or have a different hgrc than me. So still we are
not able to run `hg version` on Python 3, but we will soon.
>
> diff -r 95b076f5ddee -r 3728b3d6924f mercurial/dispatch.py
> --- a/mercurial/dispatch.py     Mon Nov 28 05:45:22 2016 +0000
> +++ b/mercurial/dispatch.py     Tue Dec 13 20:53:40 2016 +0530
> @@ -803,7 +803,8 @@
>
>          msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
>          ui.log("command", '%s\n', msg)
> -        d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
> +        strcmdopt = pycompat.strkwargs(cmdoptions)
> +        d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>          try:
>              return runcommand(lui, repo, cmd, fullargs, ui, options, d,
>                                cmdpats, cmdoptions)
> diff -r 95b076f5ddee -r 3728b3d6924f tests/test-check-py3-commands.t
> --- a/tests/test-check-py3-commands.t   Mon Nov 28 05:45:22 2016 +0000
> +++ b/tests/test-check-py3-commands.t   Tue Dec 13 20:53:40 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


More information about the Mercurial-devel mailing list