Mercurial > public > mercurial-scm > hg
comparison mercurial/mail.py @ 46683:b0253377e170 stable
mail: convert SMTPException to bytes before passing to error.Abort()
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)
Differential Revision: https://phab.mercurial-scm.org/D10168
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 11 Mar 2021 17:04:58 -0500 |
| parents | 89a2afe31e82 |
| children | d4ba4d51f85f |
comparison
equal
deleted
inserted
replaced
| 46682:8f8fce2dd594 | 46683:b0253377e170 |
|---|---|
| 163 ui.note(_(b'(authenticating to mail server as %s)\n') % username) | 163 ui.note(_(b'(authenticating to mail server as %s)\n') % username) |
| 164 username = encoding.strfromlocal(username) | 164 username = encoding.strfromlocal(username) |
| 165 try: | 165 try: |
| 166 s.login(username, password) | 166 s.login(username, password) |
| 167 except smtplib.SMTPException as inst: | 167 except smtplib.SMTPException as inst: |
| 168 raise error.Abort(inst) | 168 raise error.Abort(stringutil.forcebytestr(inst)) |
| 169 | 169 |
| 170 def send(sender, recipients, msg): | 170 def send(sender, recipients, msg): |
| 171 try: | 171 try: |
| 172 return s.sendmail(sender, recipients, msg) | 172 return s.sendmail(sender, recipients, msg) |
| 173 except smtplib.SMTPRecipientsRefused as inst: | 173 except smtplib.SMTPRecipientsRefused as inst: |