diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-04-04 16:19:22 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-04-04 16:19:22 -0300 |
commit | 75309e8bd6b762cad41eaf7d6bf8d4a3696105d2 (patch) | |
tree | 4a72d5764657a3e5df9bab7e545876e476a6360e /src/leap/common/mail.py | |
parent | 25ef3a640bb6e7877487a6300c065635092c92c0 (diff) | |
parent | 5b09a916bc83d92d5c0ecc62ee3f9788e1a56077 (diff) |
Merge branch 'release-0.3.7'0.3.7
Diffstat (limited to 'src/leap/common/mail.py')
-rw-r--r-- | src/leap/common/mail.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/common/mail.py b/src/leap/common/mail.py index 2f2146d..b630c90 100644 --- a/src/leap/common/mail.py +++ b/src/leap/common/mail.py @@ -20,26 +20,25 @@ Utility functions for email. import email import re -from leap.common.check import leap_assert_type - def get_email_charset(content, default="utf-8"): """ Mini parser to retrieve the charset of an email. :param content: mail contents - :type content: unicode + :type content: unicode or str :param default: optional default value for encoding :type default: str or None :returns: the charset as parsed from the contents :rtype: str """ - leap_assert_type(content, unicode) + if isinstance(content, unicode): + content.encode("utf-8", "replace") charset = default try: - em = email.message_from_string(content.encode("utf-8", "replace")) + em = email.message_from_string(content) # Miniparser for: Content-Type: <something>; charset=<charset> charset_re = r'''charset=(?P<charset>[\w|\d|-]*)''' charset = re.findall(charset_re, em["Content-Type"])[0] |