Mercurial > hg > mercurial-source

changeset 33679:e14484e7f562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.strkwargs() to convert kwargs keys to str before passing
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Jun 2017 15:05:11 +0530
parents 05c213cd8ab8
children 799db2af824c
files mercurial/exchange.py mercurial/formatter.py
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -25,6 +25,7 @@
     obsolete,
     phases,
     pushkey,
+    pycompat,
     scmutil,
     sslutil,
     streamclone,
@@ -1386,7 +1387,7 @@
             kwargs['obsmarkers'] = True
             pullop.stepsdone.add('obsmarkers')
     _pullbundle2extraprepare(pullop, kwargs)
-    bundle = pullop.remote.getbundle('pull', **kwargs)
+    bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
     try:
         op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction)
     except bundle2.AbortFromPart as exc:
--- a/mercurial/formatter.py
+++ b/mercurial/formatter.py
@@ -371,6 +371,7 @@
             props['templ'] = self._t
             props['repo'] = props['ctx'].repo()
             props['revcache'] = {}
+        props = pycompat.strkwargs(props)
         g = self._t(self._tref, ui=self._ui, cache=self._cache, **props)
         self._out.write(templater.stringify(g))