[PATCH 3 of 3 V4] py3: make keys of keyword arguments strings

Pulkit Goyal 7895pulkit at gmail.com
Fri Dec 9 18:03:49 EST 2016


# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1481085372 -19800
#      Wed Dec 07 10:06:12 2016 +0530
# Node ID b4a38b843dfb479ee059eb15f4c17e65951a0208
# Parent  9fcc05eb39238a645947bcfda5dcbe10399e946c
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 9fcc05eb3923 -r b4a38b843dfb 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 9fcc05eb3923 -r b4a38b843dfb 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


More information about the Mercurial-devel mailing list