Patchwork D9149: py3: use native string when comparing with a function's argspec

login
register
mail settings
Submitter phabricator
Date Oct. 5, 2020, 9:03 a.m.
Message ID <differential-rev-PHID-DREV-v5ly6lamyecupgofue2k-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47378/
State Superseded
Headers show

Comments

phabricator - Oct. 5, 2020, 9:03 a.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I only found two such bugs in `contrib/perf.py`

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  contrib/perf.py

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/perf.py b/contrib/perf.py
--- a/contrib/perf.py
+++ b/contrib/perf.py
@@ -231,7 +231,7 @@ 
     command = registrar.command(cmdtable)
 elif safehasattr(cmdutil, 'command'):
     command = cmdutil.command(cmdtable)
-    if b'norepo' not in getargspec(command).args:
+    if 'norepo' not in getargspec(command).args:
         # for "historical portability":
         # wrap original cmdutil.command, because "norepo" option has
         # been available since 3.1 (or 75a96326cecb)
@@ -805,7 +805,7 @@ 
         repo.ui.quiet = True
         matcher = scmutil.match(repo[None])
         opts[b'dry_run'] = True
-        if b'uipathfn' in getargspec(scmutil.addremove).args:
+        if 'uipathfn' in getargspec(scmutil.addremove).args:
             uipathfn = scmutil.getuipathfn(repo)
             timer(lambda: scmutil.addremove(repo, matcher, b"", uipathfn, opts))
         else: