D1107: wireproto: bounce kwargs to/from bytes/str as needed

[durin42 (Augie Fackler)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb880cc11da5d: wireproto: bounce kwargs to/from bytes/str as 
needed (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1107?vs=2809=2815

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

AFFECTED FILES
  mercurial/wireproto.py

CHANGE DETAILS

diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -313,6 +313,7 @@
 return self._callstream('stream_out')
 
 def getbundle(self, source, **kwargs):
+kwargs = pycompat.byteskwargs(kwargs)
 self.requirecap('getbundle', _('look up remote changes'))
 opts = {}
 bundlecaps = kwargs.get('bundlecaps')
@@ -337,7 +338,7 @@
 raise KeyError('unknown getbundle option type %s'
% keytype)
 opts[key] = value
-f = self._callcompressable("getbundle", **opts)
+f = self._callcompressable("getbundle", **pycompat.strkwargs(opts))
 if any((cap.startswith('HG2') for cap in bundlecaps)):
 return bundle2.getunbundler(self.ui, f)
 else:
@@ -444,7 +445,7 @@
 yield unescapearg(''.join(work))
 
 def _submitone(self, op, args):
-return self._call(op, **args)
+return self._call(op, **pycompat.strkwargs(args))
 
 def debugwireargs(self, one, two, three=None, four=None, five=None):
 # don't pass optional arguments left at their default value



To: durin42, #hg-reviewers, yuja
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1107: wireproto: bounce kwargs to/from bytes/str as needed

[durin42 (Augie Fackler)]

durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/wireproto.py

CHANGE DETAILS

diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -313,6 +313,7 @@
 return self._callstream('stream_out')
 
 def getbundle(self, source, **kwargs):
+kwargs = pycompat.byteskwargs(kwargs)
 self.requirecap('getbundle', _('look up remote changes'))
 opts = {}
 bundlecaps = kwargs.get('bundlecaps')
@@ -337,7 +338,7 @@
 raise KeyError('unknown getbundle option type %s'
% keytype)
 opts[key] = value
-f = self._callcompressable("getbundle", **opts)
+f = self._callcompressable("getbundle", **pycompat.strkwargs(opts))
 if any((cap.startswith('HG2') for cap in bundlecaps)):
 return bundle2.getunbundler(self.ui, f)
 else:
@@ -444,7 +445,7 @@
 yield unescapearg(''.join(work))
 
 def _submitone(self, op, args):
-return self._call(op, **args)
+return self._call(op, **pycompat.strkwargs(args))
 
 def debugwireargs(self, one, two, three=None, four=None, five=None):
 # don't pass optional arguments left at their default value



To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel