/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 breezy/plugins/email/emailer.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 12:50:32 UTC
  • mfrom: (6679 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610125032-xb5rd5fjskjallos
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/email/emailer.py
244
244
        to_addrs = self.to()
245
245
        if isinstance(to_addrs, basestring):
246
246
            to_addrs = [to_addrs]
247
 
        header = self.extra_headers()            
248
 
        
 
247
        header = self.extra_headers()
 
248
 
249
249
        msg = EmailMessage(from_addr, to_addrs, subject, body)
250
 
        
 
250
 
251
251
        if diff:
252
252
            msg.add_inline_attachment(diff, self.diff_filename())
253
253
 
255
255
        if header != None:
256
256
            for k, v in header.items():
257
257
                msg[k] = v
258
 
        
 
258
 
259
259
        smtp = self._smtplib_implementation(self.config)
260
260
        smtp.send_email(msg)
261
261