# HG changeset patch # User Matt Harbison # Date 2021-04-20 00:38:52 # Node ID 5fa019ceb49950dccd1bb28dc4a16f657a083e4c # Parent 83c0d144ef8d929de662dc5cbdead4127251c35c mail: force SMTPException to bytes before wrapping in error.Abort Pytype wasn't complaining about this for some reason, but PyCharm was and we already handle another instance of this exception the same way in this function. Differential Revision: https://phab.mercurial-scm.org/D10473 diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -164,7 +164,7 @@ def _smtp(ui): recipients = [r[1] for r in inst.recipients.values()] raise error.Abort(b'\n' + b'\n'.join(recipients)) except smtplib.SMTPException as inst: - raise error.Abort(inst) + raise error.Abort(stringutil.forcebytestr(inst)) return send