← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/email_message.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/email_message.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
"""A convenience class around email.Message and email.MIMEMultipart."""
18
20
 
19
21
from email import (
181
183
    def string_with_encoding(string_):
182
184
        """Return a str object together with an encoding.
183
185
 
184
 
        :param string_: A str or unicode object.
 
186
        :param string\\_: A str or unicode object.
185
187
        :return: A tuple (str, encoding), where encoding is one of 'ascii',
186
188
            'utf-8', or '8-bit', in that preferred order.
187
189
        """