Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.py @ 33033:c31d45623304
py3: convert kwargs' keys' to str using pycompat.strkwargs()
On Python 3, we must have keys of keyword arguments as str.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 22 Jun 2017 03:16:16 +0530 |
| parents | 35284f933518 |
| children | de573184686e |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Thu Jun 22 03:10:24 2017 +0530 +++ b/mercurial/simplemerge.py Thu Jun 22 03:16:16 2017 +0530 @@ -24,6 +24,7 @@ from . import ( error, mdiff, + pycompat, util, vfs as vfsmod, ) @@ -455,7 +456,8 @@ extrakwargs['base_marker'] = '|||||||' extrakwargs['name_base'] = name_base extrakwargs['minimize'] = False - for line in m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs): + for line in m3.merge_lines(name_a=name_a, name_b=name_b, + **pycompat.strkwargs(extrakwargs)): out.write(line) if not opts.get('print'):