Patchwork D2445: bundle2: **strkwargs love on various kwargs constructions

login
register
mail settings
Submitter phabricator
Date Feb. 26, 2018, 1:12 p.m.
Message ID <d9352b6ccb46ab4da1389a7d00c7f756@localhost.localdomain>
Download mbox | patch
Permalink /patch/28393/
State Not Applicable
Headers show

Comments

phabricator - Feb. 26, 2018, 1:12 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG247b473f408e: bundle2: **strkwargs love on various kwargs constructions (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2445?vs=6100&id=6116

REVISION DETAIL
  https://phab.mercurial-scm.org/D2445

AFFECTED FILES
  mercurial/bundle2.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -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):