Mercurial > hg-stable
changeset 36457:247b473f408e
bundle2: **strkwargs love on various kwargs constructions
Differential Revision: https://phab.mercurial-scm.org/D2445
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 26 Feb 2018 00:27:47 -0500 |
| parents | 23d12524a202 |
| children | 0b697c650b04 |
| files | mercurial/bundle2.py |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Sun Feb 25 23:51:32 2018 -0500 +++ b/mercurial/bundle2.py Mon Feb 26 00:27:47 2018 -0500 @@ -1946,7 +1946,8 @@ value = inpart.params.get(name) if value is not None: kwargs[name] = value - raise error.PushkeyFailed(inpart.params['in-reply-to'], **kwargs) + raise error.PushkeyFailed(inpart.params['in-reply-to'], + **pycompat.strkwargs(kwargs)) @parthandler('error:unsupportedcontent', ('parttype', 'params')) def handleerrorunsupportedcontent(op, inpart): @@ -1959,7 +1960,7 @@ if params is not None: kwargs['params'] = params.split('\0') - raise error.BundleUnknownFeatureError(**kwargs) + raise error.BundleUnknownFeatureError(**pycompat.strkwargs(kwargs)) @parthandler('error:pushraced', ('message',)) def handleerrorpushraced(op, inpart): @@ -2001,7 +2002,8 @@ for key in ('namespace', 'key', 'new', 'old', 'ret'): if key in inpart.params: kwargs[key] = inpart.params[key] - raise error.PushkeyFailed(partid=str(inpart.id), **kwargs) + raise error.PushkeyFailed(partid=str(inpart.id), + **pycompat.strkwargs(kwargs)) @parthandler('bookmarks') def handlebookmark(op, inpart):