This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10166

typing: ensure that error.Abort is given bytes
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:08 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGae62ab82a345: typing: ensure that error.Abort is given bytes
Summary

There's a bunch more typing to be done here, but the list of things to fix is
already long, and I know there are instances where this is being used
incorrectly.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Mar 12 2021, 1:08 PM
pulkit accepted this revision.Mar 12 2021, 1:13 PM
This revision is now accepted and ready to land.Mar 12 2021, 1:13 PM
mharbison72 added a commit: rHGae62ab82a345: typing: ensure that error.Abort is given bytes.Mar 17 2021, 6:10 AM
Closed by commit rHGae62ab82a345: typing: ensure that error.Abort is given bytes (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (6 lines)

Diff 26456

mercurial/error.py

from __future__ import absolute_import from __future__ import absolute_import
import difflib import difflib
# Do not import anything but pycompat here, please # Do not import anything but pycompat here, please
from . import pycompat from . import pycompat
if pycompat.TYPE_CHECKING:
from typing import (
Optional,
)
def _tobytes(exc): def _tobytes(exc):
"""Byte-stringify exception in the same way as BaseException_str()""" """Byte-stringify exception in the same way as BaseException_str()"""
if not exc.args: if not exc.args:
return b'' return b''
if len(exc.args) == 1: if len(exc.args) == 1:
return pycompat.bytestr(exc.args[0]) return pycompat.bytestr(exc.args[0])
return b'(%s)' % b', '.join(b"'%s'" % pycompat.bytestr(a) for a in exc.args) return b'(%s)' % b', '.join(b"'%s'" % pycompat.bytestr(a) for a in exc.args)
% opname, % opname,
) )
class Abort(Hint, Exception): class Abort(Hint, Exception):
"""Raised if a command needs to print an error and exit.""" """Raised if a command needs to print an error and exit."""
def __init__(self, message, hint=None): def __init__(self, message, hint=None):
# type: (bytes, Optional[bytes]) -> None
self.message = message self.message = message
self.hint = hint self.hint = hint
# Pass the message into the Exception constructor to help extensions # Pass the message into the Exception constructor to help extensions
# that look for exc.args[0]. # that look for exc.args[0].
Exception.__init__(self, message) Exception.__init__(self, message)
def __bytes__(self): def __bytes__(self):
return self.message return self.message