diff -r 07a7b57d3e33 -r 9baec00b4ca1 mercurial/error.py --- a/mercurial/error.py Mon Feb 21 10:26:25 2022 -0700 +++ b/mercurial/error.py Mon Feb 21 10:27:02 2022 -0700 @@ -68,14 +68,12 @@ def __bytes__(self): return self.message - if pycompat.ispy3: - - def __str__(self): - # type: () -> str - # the output would be unreadable if the message was translated, - # but do not replace it with encoding.strfromlocal(), which - # may raise another exception. - return pycompat.sysstr(self.__bytes__()) + def __str__(self): + # type: () -> str + # the output would be unreadable if the message was translated, + # but do not replace it with encoding.strfromlocal(), which + # may raise another exception. + return pycompat.sysstr(self.__bytes__()) def format(self): # type: () -> bytes