Patchwork D2172: py3: convert FrameInfo members to bytes

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

Comments

phabricator - Feb. 13, 2018, 2:48 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG20dbe0eee139: py3: convert FrameInfo members to bytes (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2172?vs=5473&id=5595

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

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1622,12 +1622,12 @@ 
             calframe = inspect.getouterframes(curframe, 2)
             frameinfo = calframe[stacklevel]
 
-            self.write_err('%s at: %s:%s (%s)\n' % (
-                msg, frameinfo.filename, frameinfo.lineno,
-                frameinfo.function))
-            self.log('develwarn', '%s at: %s:%s (%s)\n',
-                     msg, frameinfo.filename, frameinfo.lineno,
-                     frameinfo.function)
+            self.write_err('%s at: %s:%d (%s)\n' % (
+                msg, pycompat.sysbytes(frameinfo.filename),
+                frameinfo.lineno, pycompat.sysbytes(frameinfo.function)))
+            self.log('develwarn', '%s at: %s:%d (%s)\n',
+                     msg, pycompat.sysbytes(frameinfo.filename),
+                     frameinfo.lineno, pycompat.sysbytes(frameinfo.function))
             curframe = calframe = frameinfo = None  # avoid cycles
 
     def deprecwarn(self, msg, version, stacklevel=2):