[Erp5-report] r30479 - /erp5/trunk/products/ERP5Type/tests/utils.py

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Nov 10 16:22:32 2009
New Revision: 30479

URL: http://svn.erp5.org?rev=30479&view=rev
Log:
Only decode into getMessageList() and keep the mail message text intact because some tests expect it. Optionally, the original messages can be get by getMessageList(decode=False) instead access _message_list.

Modified:
    erp5/trunk/products/ERP5Type/tests/utils.py

Modified: erp5/trunk/products/ERP5Type/tests/utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/utils.py?rev=30479&r1=30478&r2=30479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/utils.py [utf8] Tue Nov 10 16:22:32 2009
@@ -61,16 +61,21 @@
   _message_list = []
   def _send( self, mfrom, mto, messageText ):
     """Record message in _last_message."""
+    self._previous_message = self._last_message
+    self._last_message = (mfrom, mto, messageText)
+    self._message_list.append(self._last_message)
+  def _decodeMessage(self, messageText):
+    """ Decode message"""
     message_text = messageText
     for part in message_from_string(messageText).walk():
       if part.get_content_type() in ['text/plain', 'text/html' ] \
-             and not part.is_multipart():
+                  and not part.is_multipart():
         message_text = part.get_payload(decode=1)
-    self._previous_message = self._last_message
-    self._last_message = (mfrom, mto, message_text)
-    self._message_list.append(self._last_message)
-  def getMessageList(self):
+    return message_text
+  def getMessageList(self, decode=True):
     """ Return message list"""
+    if decode:
+      return [ (m[0], m[1], self._decodeMessage(m[2])) for m in self._message_list]
     return self._message_list
 
 class DummyTranslationService: