/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/mail_client.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 15:38:26 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205153826-rnrd0m3iqoizqvrw
Apply 2to3 except fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mail_client.py
184
184
                                                         **kwargs))
185
185
            try:
186
186
                subprocess.call(cmdline)
187
 
            except OSError, e:
 
187
            except OSError as e:
188
188
                if e.errno != errno.ENOENT:
189
189
                    raise
190
190
            else:
533
533
        try:
534
534
            simplemapi.SendMail(to or '', subject or '', body or '',
535
535
                                attach_path)
536
 
        except simplemapi.MAPIError, e:
 
536
        except simplemapi.MAPIError as e:
537
537
            if e.code != simplemapi.MAPI_USER_ABORT:
538
538
                raise errors.MailClientNotFound(['MAPI supported mail client'
539
539
                                                 ' (error %d)' % (e.code,)])