[entropy.misc] fix EmailSender with Python 3.x

2009-10-06 19:00:50 +02:00
parent a9b91a8cef
commit b2fdfe72fb
1 changed files with 10 additions and 4 deletions
@@ -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