Patchwork D2212: util: convert traceback-related sysstrs to sysbytes in getstackframes

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2018, 3:48 a.m.
Message ID <474feb2b8167ee28231badf3d782687a@localhost.localdomain>
Download mbox | patch
Permalink /patch/27793/
State Not Applicable
Headers show

Comments

phabricator - Feb. 13, 2018, 3:48 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7ec26f27ca83: util: convert traceback-related sysstrs to sysbytes in getstackframes (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2212?vs=5604&id=5611

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

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -3171,7 +3171,7 @@ 
 
     Not be used in production code but very convenient while developing.
     '''
-    entries = [(fileline % (fn, ln), func)
+    entries = [(fileline % (pycompat.sysbytes(fn), ln), pycompat.sysbytes(func))
         for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]
         ][-depth:]
     if entries: