This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2172

py3: convert FrameInfo members to bytes
ClosedPublic

Authored by indygreg on Feb 11 2018, 10:45 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG20dbe0eee139: py3: convert FrameInfo members to bytes
Summary

The filename and function name fields are system strings. We need
to convert them to bytes to work with our logging I/O.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (12 lines)

Diff 5473

mercurial/ui.py

util.debugstacktrace(msg, stacklevel, self.ferr, self.fout) util.debugstacktrace(msg, stacklevel, self.ferr, self.fout)
self.log('develwarn', '%s at:\n%s' % self.log('develwarn', '%s at:\n%s' %
(msg, ''.join(util.getstackframes(stacklevel)))) (msg, ''.join(util.getstackframes(stacklevel))))
else: else:
curframe = inspect.currentframe() curframe = inspect.currentframe()
calframe = inspect.getouterframes(curframe, 2) calframe = inspect.getouterframes(curframe, 2)
frameinfo = calframe[stacklevel] frameinfo = calframe[stacklevel]
self.write_err('%s at: %s:%s (%s)\n' % ( self.write_err('%s at: %s:%d (%s)\n' % (
msg, frameinfo.filename, frameinfo.lineno, msg, pycompat.sysbytes(frameinfo.filename),
frameinfo.function)) frameinfo.lineno, pycompat.sysbytes(frameinfo.function)))
self.log('develwarn', '%s at: %s:%s (%s)\n', self.log('develwarn', '%s at: %s:%d (%s)\n',
msg, frameinfo.filename, frameinfo.lineno, msg, pycompat.sysbytes(frameinfo.filename),
frameinfo.function) frameinfo.lineno, pycompat.sysbytes(frameinfo.function))
curframe = calframe = frameinfo = None # avoid cycles curframe = calframe = frameinfo = None # avoid cycles
def deprecwarn(self, msg, version, stacklevel=2): def deprecwarn(self, msg, version, stacklevel=2):
"""issue a deprecation warning """issue a deprecation warning
- msg: message explaining what is deprecated and how to upgrade, - msg: message explaining what is deprecated and how to upgrade,
- version: last version where the API will be supported, - version: last version where the API will be supported,
""" """