This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10473

mail: force SMTPException to bytes before wrapping in error.Abort
ClosedPublic

Authored by mharbison72 on Apr 19 2021, 9:08 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG5fa019ceb499: mail: force SMTPException to bytes before wrapping in error.Abort
Summary

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.

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.Apr 19 2021, 9:08 PM
marmoute accepted this revision.Apr 20 2021, 5:39 AM
mharbison72 added a commit: rHG5fa019ceb499: mail: force SMTPException to bytes before wrapping in error.Abort.Apr 20 2021, 10:23 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5fa019ceb499: mail: force SMTPException to bytes before wrapping in error.Abort (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (2 lines)

Diff 27125

mercurial/mail.py

def send(sender, recipients, msg): def send(sender, recipients, msg):
try: try:
return s.sendmail(sender, recipients, msg) return s.sendmail(sender, recipients, msg)
except smtplib.SMTPRecipientsRefused as inst: except smtplib.SMTPRecipientsRefused as inst:
recipients = [r[1] for r in inst.recipients.values()] recipients = [r[1] for r in inst.recipients.values()]
raise error.Abort(b'\n' + b'\n'.join(recipients)) raise error.Abort(b'\n' + b'\n'.join(recipients))
except smtplib.SMTPException as inst: except smtplib.SMTPException as inst:
raise error.Abort(inst) raise error.Abort(stringutil.forcebytestr(inst))
return send return send
def _smtp_login(ui, smtp, mailhost, mailport): def _smtp_login(ui, smtp, mailhost, mailport):
"""A hook for the keyring extension to perform the actual SMTP login. """A hook for the keyring extension to perform the actual SMTP login.
An already connected SMTP object of the proper type is provided, based on An already connected SMTP object of the proper type is provided, based on