diff -r d60678a567a9 -r 328739ea70c3 mercurial/mail.py --- a/mercurial/mail.py Tue Jun 23 22:38:21 2015 -0700 +++ b/mercurial/mail.py Tue Jun 23 22:20:08 2015 -0700 @@ -138,16 +138,16 @@ (username)) try: s.login(username, password) - except smtplib.SMTPException, inst: + except smtplib.SMTPException as inst: raise util.Abort(inst) def send(sender, recipients, msg): try: return s.sendmail(sender, recipients, msg) - except smtplib.SMTPRecipientsRefused, inst: + except smtplib.SMTPRecipientsRefused as inst: recipients = [r[1] for r in inst.recipients.values()] raise util.Abort('\n' + '\n'.join(recipients)) - except smtplib.SMTPException, inst: + except smtplib.SMTPException as inst: raise util.Abort(inst) return send