# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1519064081 -19800 # Node ID 93943eef696f413fe743682bbc7201e2c10a3ffa # Parent 8d0b0b533e09354cc2f9d002ad2a93e0035e340a py3: use pycompat.byteskwargs in hgext/convert/ Differential Revision: https://phab.mercurial-scm.org/D2355 diff -r 8d0b0b533e09 -r 93943eef696f hgext/convert/common.py --- a/hgext/convert/common.py Mon Feb 19 21:45:49 2018 +0530 +++ b/hgext/convert/common.py Mon Feb 19 23:44:41 2018 +0530 @@ -18,6 +18,7 @@ encoding, error, phases, + pycompat, util, ) @@ -322,6 +323,7 @@ pass def _cmdline(self, cmd, *args, **kwargs): + kwargs = pycompat.byteskwargs(kwargs) cmdline = [self.command, cmd] + list(args) for k, v in kwargs.iteritems(): if len(k) == 1: diff -r 8d0b0b533e09 -r 93943eef696f hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py Mon Feb 19 21:45:49 2018 +0530 +++ b/hgext/convert/convcmd.py Mon Feb 19 23:44:41 2018 +0530 @@ -567,6 +567,7 @@ self.map.close() def convert(ui, src, dest=None, revmapfile=None, **opts): + opts = pycompat.byteskwargs(opts) global orig_encoding orig_encoding = encoding.encoding encoding.encoding = 'UTF-8' diff -r 8d0b0b533e09 -r 93943eef696f hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py Mon Feb 19 21:45:49 2018 +0530 +++ b/hgext/convert/cvsps.py Mon Feb 19 23:44:41 2018 +0530 @@ -855,6 +855,7 @@ repository, and convert the log to changesets based on matching commit log entries and dates. ''' + opts = pycompat.byteskwargs(opts) if opts["new_cache"]: cache = "write" elif opts["update_cache"]: diff -r 8d0b0b533e09 -r 93943eef696f hgext/convert/monotone.py --- a/hgext/convert/monotone.py Mon Feb 19 21:45:49 2018 +0530 +++ b/hgext/convert/monotone.py Mon Feb 19 23:44:41 2018 +0530 @@ -13,6 +13,7 @@ from mercurial.i18n import _ from mercurial import ( error, + pycompat, util, ) @@ -89,6 +90,7 @@ def mtnrunstdio(self, *args, **kwargs): # Prepare the command in automate stdio format + kwargs = pycompat.byteskwargs(kwargs) command = [] for k, v in kwargs.iteritems(): command.append("%s:%s" % (len(k), k))