py3: handle keyword arguments in hgext/extdiff.py
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 23 Oct 2017 00:02:07 +0530
changeset 34976 a8bc191fee5a
parent 34975 901a18b03e00
child 34977 a56bf5591918
py3: handle keyword arguments in hgext/extdiff.py Differential Revision: https://phab.mercurial-scm.org/D1301
hgext/extdiff.py
--- a/hgext/extdiff.py	Mon Oct 23 00:01:45 2017 +0530
+++ b/hgext/extdiff.py	Mon Oct 23 00:02:07 2017 +0530
@@ -338,6 +338,7 @@
     that revision is compared to the working directory, and, when no
     revisions are specified, the working directory files are compared
     to its parent.'''
+    opts = pycompat.byteskwargs(opts)
     program = opts.get('program')
     option = opts.get('option')
     if not program:
@@ -369,6 +370,7 @@
         self._cmdline = cmdline
 
     def __call__(self, ui, repo, *pats, **opts):
+        opts = pycompat.byteskwargs(opts)
         options = ' '.join(map(util.shellquote, opts['option']))
         if options:
             options = ' ' + options