py3: use pycompat.strkwargs() to convert kwargs keys to str before passing

mercurial/exchange.py

@@ -25,6 +25,7 b' from . import ('
     obsolete,
     phases,
     pushkey,
+    pycompat,
     scmutil,
     sslutil,
     streamclone,
@@ -1386,7 +1387,7 b' def _pullbundle2(pullop):'
             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:

mercurial/formatter.py

@@ -371,6 +371,7 b' class templateformatter(baseformatter):'
             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))