[Python-checkins] r50836 - python/branches/release23-maint/Lib/email/test/test_email.py

[barry.warsaw]

Author: barry.warsaw
Date: Wed Jul 26 05:55:09 2006
New Revision: 50836

Modified:
   python/branches/release23-maint/Lib/email/test/test_email.py
Log:
Fix the tests to work with Python 2.1, which email 2.5 must do.


Modified: python/branches/release23-maint/Lib/email/test/test_email.py
==============================================================================
--- python/branches/release23-maint/Lib/email/test/test_email.py	(original)
+++ python/branches/release23-maint/Lib/email/test/test_email.py	Wed Jul 26 05:55:09 2006
@@ -9,7 +9,7 @@
 import unittest
 import warnings
 from cStringIO import StringIO
-from types import StringType, ListType
+from types import StringType, ListType, TupleType
 
 import email
 
@@ -2757,7 +2757,7 @@
 '''
         msg = email.message_from_string(m)
         param = msg.get_param('NAME')
-        self.failIf(isinstance(param, tuple))
+        self.failIf(isinstance(param, TupleType))
         self.assertEqual(
             param,
             'file____C__DOCUMENTS_20AND_20SETTINGS_FABIEN_LOCAL_20SETTINGS_TEMP_nsmail.htm')
@@ -2899,7 +2899,7 @@
 """
         msg = email.message_from_string(m)
         param = msg.get_param('name')
-        self.failIf(isinstance(param, tuple))
+        self.failIf(isinstance(param, TupleType))
         self.assertEqual(param, "Frank's Document")
 
     def test_rfc2231_tick_attack_extended(self):
@@ -2923,7 +2923,7 @@
 """
         msg = email.message_from_string(m)
         param = msg.get_param('name')
-        self.failIf(isinstance(param, tuple))
+        self.failIf(isinstance(param, TupleType))
         self.assertEqual(param, "us-ascii'en-us'Frank's Document")
 
     def test_rfc2231_no_extended_values(self):