This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10474

errors: define OutOfBandError in py2-compatible way
AbandonedPublic

Authored by pulkit on Apr 20 2021, 12:08 AM.

Details

Reviewers
mharbison72
martinvonz
Group Reviewers
hg-reviewers
Summary

CI reports that my D10465 does not work on py2 because (it seems)
single keyword arguments are not allowed after *args; py2 seems to
require **kwargs after *args.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Apr 20 2021, 12:08 AM
Alphare added a subscriber: Alphare.Apr 20 2021, 7:56 AM

This should be closed, then. Thanks for fixing and amending this.

mharbison72 accepted this revision.Apr 30 2021, 9:28 PM

Already amended in as noted (let's see if accepting closes it).

This revision is now accepted and ready to land.Apr 30 2021, 9:28 PM
pulkit added a reviewer: martinvonz.May 6 2021, 3:04 PM
pulkit commandeered this revision.
pulkit abandoned this revision.

Revision Contents
Changeset List

PathPackages
Mmercurial/error.py (4 lines)

Diff 27070

mercurial/error.py

class RemoteError(Abort): class RemoteError(Abort):
"""Exception raised when interacting with a remote repo fails""" """Exception raised when interacting with a remote repo fails"""
class OutOfBandError(RemoteError): class OutOfBandError(RemoteError):
"""Exception raised when a remote repo reports failure""" """Exception raised when a remote repo reports failure"""
def __init__(self, *messages, hint=None): def __init__(self, *messages, **kwargs):
# type: (Any, Optional[bytes]) -> None # type: (Any, Optional[bytes]) -> None
from .i18n import _ from .i18n import _
if messages: if messages:
message = _(b"remote error:\n%s") % b''.join(messages) message = _(b"remote error:\n%s") % b''.join(messages)
# Abort.format() adds a trailing newline # Abort.format() adds a trailing newline
message = message.rstrip(b'\n') message = message.rstrip(b'\n')
else: else:
message = _(b"remote error") message = _(b"remote error")
super(OutOfBandError, self).__init__(message, hint=hint) super(OutOfBandError, self).__init__(message, **kwargs)
class ParseError(Abort): class ParseError(Abort):
"""Raised when parsing config files and {rev,file}sets (msg[, pos])""" """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
def __init__(self, message, location=None, hint=None): def __init__(self, message, location=None, hint=None):
# type: (bytes, Optional[Union[bytes, int]], Optional[bytes]) -> None # type: (bytes, Optional[Union[bytes, int]], Optional[bytes]) -> None
super(ParseError, self).__init__(message, hint=hint) super(ParseError, self).__init__(message, hint=hint)