From b2fdfe72fb1764d431b06f48a285b765a0812ca6 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 6 Oct 2009 19:00:50 +0200 Subject: [PATCH] [entropy.misc] fix EmailSender with Python 3.x --- libraries/entropy/misc.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/entropy/misc.py b/libraries/entropy/misc.py index 1d7ce6808..0e7b5344f 100644 --- a/libraries/entropy/misc.py +++ b/libraries/entropy/misc.py @@ -424,10 +424,16 @@ class EmailSender: @rtype: None """ # Create a text/plain message - if const_isunicode(content): - content = content.encode('utf-8') - if const_isunicode(subject): - subject = subject.encode('utf-8') + if sys.hexversion < 0x3000000: + if const_isunicode(content): + content = content.encode('utf-8') + if const_isunicode(subject): + subject = subject.encode('utf-8') + else: + if not const_isunicode(content): + raise AttributeError("content must be unicode (str)") + if not const_isunicode(subject): + raise AttributeError("subject must be unicode (str)") msg = self.text(content) msg['Subject'] = subject