Changeset 143:1d4505cef74f

Timestamp:

07/31/07 17:15:58 (13 months ago)

Author:

Tarek Ziad?? <tarek@…>

Message:

fixed mail headers

Files:

• mailer/mailer.py (modified) (1 diff)
• mailer/tests/test_mailer.py (modified) (1 diff)
• xap/xapindexer.py (modified) (1 diff)

mailer/mailer.py

@@ -47 +47 @@
     def _get_message(self, mail):
         """returns a Mime"""
-        msg = MIMEText(b64decode(mail.data))
+        data = b64decode(mail.data)
+        # some sgbd are in unicode
+        if isinstance(data, unicode):
+            data = data.decode('utf8')
+        msg = MIMEText(data)
         msg['From'] = mail.sender
         msg['To'] = mail.recipients
         msg['Subject'] = mail.subject
-
-        msg['Date'] = mail.date.isoformat()
+        msg.set_charset('utf-8')
+        msg['Date'] = mail.date.strftime('%c')
         return msg
 

mailer/tests/test_mailer.py

@@ -45 +45 @@
 
         worker = MailWorker()
-        mail_id = send_mail('toto', 'toto@toto.com',
-                            'vouvou', 'coucou')
+        mail_id = send_mail('toto', ['toto@toto.com'],
+                            'vouvou', 'coucou é')
 
         mail = worker._get_mails()[0]
         msg = worker._get_message(mail)
+        raw = """\
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+From: toto
+To: toto@toto.com
+Subject: vouvou
+Content-Type: text/plain; charset="utf-8"
+
+coucou \xc3\xa9"""
+
+        msg = msg.as_string().split('\n')
+        msg = [line for line in msg if not line.startswith('Date')]
+        msg = '\n'.join(msg)
+
+        self.assertEquals(msg, raw)
+
 
 def test_suite():

xap/xapindexer.py

@@ -56 +56 @@
     def index_document(self, uid, text):
         """indexes the given document"""
+
         logging.debug('xap:indexing %s' % uid)
         words = tokenize([text], options={'treshold': 2})