py3: fix kwargs handling for `hg bookmarks`

mercurial/bookmarks.py

@@ -20,6 +20,7 b' from . import ('
     error,
     lock as lockmod,
     obsolete,
+    pycompat,
     scmutil,
     txnutil,
     util,
@@ -771,6 +772,7 b' def _printbookmarks(ui, repo, bmarks, **'
     Provides a way for extensions to control how bookmarks are printed (e.g.
     prepend or postpend names)
     """
+    opts = pycompat.byteskwargs(opts)
     fm = ui.formatter('bookmarks', opts)
     hexfn = fm.hexfunc
     if len(bmarks) == 0 and fm.isplain():

mercurial/commands.py

@@ -944,12 +944,11 b' def bookmark(ui, repo, *names, **opts):'
 
           hg book -f @
     '''
-    opts = pycompat.byteskwargs(opts)
-    force = opts.get('force')
-    rev = opts.get('rev')
-    delete = opts.get('delete')
-    rename = opts.get('rename')
-    inactive = opts.get('inactive')
+    force = opts.get(r'force')
+    rev = opts.get(r'rev')
+    delete = opts.get(r'delete')
+    rename = opts.get(r'rename')
+    inactive = opts.get(r'inactive')
 
     if delete and rename:
         raise error.Abort(_("--delete and --rename are incompatible"))