/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/email_message.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
 
29
29
from . import __version__ as _breezy_version
30
30
from .osutils import safe_unicode
 
31
from .sixish import (
 
32
    text_type,
 
33
    )
31
34
from .smtp_connection import SMTPConnection
32
35
 
33
36
 
60
63
        self._body = body
61
64
        self._parts = []
62
65
 
63
 
        if isinstance(to_address, basestring):
 
66
        if isinstance(to_address, (str, text_type)):
64
67
            to_address = [ to_address ]
65
68
 
66
69
        to_addresses = []