This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10168

mail: convert SMTPException to bytes before passing to error.Abort()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb0253377e170: mail: convert SMTPException to bytes before passing to error.Abort()
Summary

Caught by pytype:

File "/mnt/c/Users/Matt/hg/mercurial/mail.py", line 168, in _smtp: Function Abort.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, message: Union[bytearray, bytes, memoryview], ...)
  Actually passed: (self, message: smtplib.SMTPException)

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (2 lines)

Diff 26458

mercurial/mail.py

if password is not None: if password is not None:
password = encoding.strfromlocal(password) password = encoding.strfromlocal(password)
if username and password: if username and password:
ui.note(_(b'(authenticating to mail server as %s)\n') % username) ui.note(_(b'(authenticating to mail server as %s)\n') % username)
username = encoding.strfromlocal(username) username = encoding.strfromlocal(username)
try: try:
s.login(username, password) s.login(username, password)
except smtplib.SMTPException as inst: except smtplib.SMTPException as inst:
raise error.Abort(inst) raise error.Abort(stringutil.forcebytestr(inst))
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: