[PATCH] py3: make keys of keyword arguments strings

Pulkit Goyal 7895pulkit at gmail.com
Wed Dec 7 00:13:24 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 60372f5694c6b188fba456cfd269690e84ac645b
# Parent  831d29deed083618bddc2fade7d2a6fe297c896d
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 831d29deed08 -r 60372f5694c6 mercurial/dispatch.py
--- a/mercurial/dispatch.py	Tue Dec 06 11:44:49 2016 +0000
+++ 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.fsdecode(k):v for k, v in cmdoptions.items()}
         d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
         try:
             return runcommand(lui, repo, cmd, fullargs, ui, options, d,
diff -r 831d29deed08 -r 60372f5694c6 tests/test-check-py3-commands.t
--- a/tests/test-check-py3-commands.t	Tue Dec 06 11:44:49 2016 +0000
+++ 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