← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 01:12:15 UTC
  • mto: This revision was merged to the branch mainline in revision 5757.
  • Revision ID: jelmer@samba.org-20110405011215-8g6izwf3uz8v4174
Remove some unnecessary imports, clean up lazy imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
25
25
    diff,
 
26
    email_message,
26
27
    errors,
27
28
    gpg,
28
29
    hooks,
36
37
from bzrlib.bundle import (
37
38
    serializer as bundle_serializer,
38
39
    )
39
 
from bzrlib.email_message import EmailMessage
40
40
""")
41
41
 
42
42
 
266
266
            body = self.to_signed(branch)
267
267
        else:
268
268
            body = ''.join(self.to_lines())
269
 
        message = EmailMessage(mail_from, mail_to, subject, body)
 
269
        message = email_message.EmailMessage(mail_from, mail_to, subject,
 
270
            body)
270
271
        return message
271
272
 
272
273
    def install_revisions(self, target_repo):