From patchwork Thu Nov  2 21:14:49 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1301: py3: handle keyword arguments in hgext/extdiff.py
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 25366
Message-Id: <differential-rev-PHID-DREV-a6jja7maipqhunqnbhel-req@phab.mercurial-scm.org>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 2 Nov 2017 21:14:49 +0000

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1301

AFFECTED FILES
  hgext/extdiff.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -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