# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2017-12-09 23:20:16 # Node ID 7d2292416046314387e09bd4ede710b3ddb8a6db # Parent 4e377c43e80b5ac6f6d98519c25a7132137a6785 py3: handle keyword arguments correctly in wireproto.py Differential Revision: https://phab.mercurial-scm.org/D1647 diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py --- a/mercurial/wireproto.py +++ b/mercurial/wireproto.py @@ -452,9 +452,9 @@ class wirepeer(repository.legacypeer): # don't pass optional arguments left at their default value opts = {} if three is not None: - opts['three'] = three + opts[r'three'] = three if four is not None: - opts['four'] = four + opts[r'four'] = four return self._call('debugwireargs', one=one, two=two, **opts) def _call(self, cmd, **args): @@ -817,7 +817,7 @@ def changegroupsubset(repo, proto, bases def debugwireargs(repo, proto, one, two, others): # only accept optional args from the known set opts = options('debugwireargs', ['three', 'four'], others) - return repo.debugwireargs(one, two, **opts) + return repo.debugwireargs(one, two, **pycompat.strkwargs(opts)) @wireprotocommand('getbundle', '*') def getbundle(repo, proto, others):