From da69367843a46f5fe0e418b252f4c4479fa3362b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Oct 2006 14:48:39 +0100 Subject: - new message_from_string function - fixed get_payload encoding bug --- umessage.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'umessage.py') diff --git a/umessage.py b/umessage.py index a42cb40..b28663f 100644 --- a/umessage.py +++ b/umessage.py @@ -21,6 +21,12 @@ def message_from_file(fd): except email.Errors.MessageParseError: return '' +def message_from_string(string): + try: + return UMessage(email.message_from_string(string)) + except email.Errors.MessageParseError: + return '' + class UMessage: """Encapsulates an email.Message instance and returns only unicode objects""" @@ -47,7 +53,8 @@ class UMessage: return [UMessage(msg) for msg in payload] if message.get_content_maintype() != 'text': return payload - return unicode(payload or '', message.get_charset() or 'iso-8859-15') + return unicode(payload or '', message.get_content_charset() + or 'iso-8859-15') else: payload = UMessage(message.get_payload(index, decode)) return payload -- cgit v1.2.1