# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1523523391 -19800
# Node ID e7eea8582afaa827dc46bfcfdb5c97b21d8927ab
# Parent  6ef94f24aa82c0123e34bad66c25f46d28ce1e0f
py3: use pycompat.{strkwargs|byteskwargs} in infinitepush

Differential Revision: https://phab.mercurial-scm.org/D3275

diff -r 6ef94f24aa82 -r e7eea8582afa hgext/infinitepush/__init__.py
--- a/hgext/infinitepush/__init__.py	Wed Apr 11 22:36:16 2018 +0530
+++ b/hgext/infinitepush/__init__.py	Thu Apr 12 14:26:31 2018 +0530
@@ -123,6 +123,7 @@
     peer,
     phases,
     pushkey,
+    pycompat,
     registrar,
     util,
     wireproto,
@@ -579,6 +580,7 @@
     return _lookup
 
 def _pull(orig, ui, repo, source="default", **opts):
+    opts = pycompat.byteskwargs(opts)
     # Copy paste from `pull` command
     source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
 
@@ -620,7 +622,7 @@
         # Remote scratch bookmarks will be deleted because remotenames doesn't
         # know about them. Let's save it before pull and restore after
         remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, source)
-        result = orig(ui, repo, source, **opts)
+        result = orig(ui, repo, source, **pycompat.strkwargs(opts))
         # TODO(stash): race condition is possible
         # if scratch bookmarks was updated right after orig.
         # But that's unlikely and shouldn't be harmful.