Patchwork D3300: fix: port most of the way to python 3

login
register
mail settings
Submitter phabricator
Date April 13, 2018, 8:22 a.m.
Message ID <4d7f11b2909d68d4253c7940724ebbd6@localhost.localdomain>
Download mbox | patch
Permalink /patch/30850/
State Not Applicable
Headers show

Comments

phabricator - April 13, 2018, 8:22 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1edf3738e000: fix: port most of the way to python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3300?vs=8093&id=8108

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

AFFECTED FILES
  hgext/fix.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -66,6 +66,7 @@ 
     mdiff,
     merge,
     obsolete,
+    pycompat,
     registrar,
     scmutil,
     util,
@@ -126,6 +127,7 @@ 
     revisions are not forgotten in later ones. The --base flag can be used to
     override this default behavior, though it is not usually desirable to do so.
     """
+    opts = pycompat.byteskwargs(opts)
     if opts['all']:
         if opts['rev']:
             raise error.Abort(_('cannot specify both "--rev" and "--all"'))
@@ -513,7 +515,8 @@ 
         result[name] = Fixer()
         attrs = ui.configsuboptions('fix', name)[1]
         for key in FIXER_ATTRS:
-            setattr(result[name], '_' + key, attrs.get(key, ''))
+            setattr(result[name], pycompat.sysstr('_' + key),
+                    attrs.get(key, ''))
     return result
 
 def fixernames(ui):