# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 2017-10-22 18:34:12
# Node ID 135edf120d76305d90d398c28a5adfbbd0d0c2e2
# Parent  c4b769bc86da803dc013f3683ff37738ac57233d

py3: handle keyword arguments in hgext/journal.py

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

diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -30,6 +30,7 @@ from mercurial import (
     localrepo,
     lock,
     node,
+    pycompat,
     registrar,
     util,
 )
@@ -133,7 +134,7 @@ def _mergeentriesiter(*iterables, **kwar
 
     Note that by default entries go from most recent to oldest.
     """
-    order = kwargs.pop('order', max)
+    order = kwargs.pop(r'order', max)
     iterables = [iter(it) for it in iterables]
     # this tracks still active iterables; iterables are deleted as they are
     # exhausted, which is why this is a dictionary and why each entry also
@@ -458,6 +459,7 @@ def journal(ui, repo, *args, **opts):
     `hg journal -T json` can be used to produce machine readable output.
 
     """
+    opts = pycompat.byteskwargs(opts)
     name = '.'
     if opts.get('all'):
         if args: