← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/email_message.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-26 20:30:53 UTC
  • mfrom: (5920 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5924.
  • Revision ID: v.ladeuil+lp@free.fr-20110526203053-hbjn6yuzwg03wnuv
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/email_message.py
181
181
    def string_with_encoding(string_):
182
182
        """Return a str object together with an encoding.
183
183
 
184
 
        :param string_: A str or unicode object.
 
184
        :param string\\_: A str or unicode object.
185
185
        :return: A tuple (str, encoding), where encoding is one of 'ascii',
186
186
            'utf-8', or '8-bit', in that preferred order.
187
187
        """