Make the tests pass under Python 2.1 but only by cheating. Python 2.1

doesn't know about the ansi-x3.4-1968 charset so skip two tests that
rely on that (msg_32.txt and msg_33.txt).

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 459915696703c70326b8b2a2222597936f1119a6..07460b93ca788bf826e2e989e313ec1551a29466 100644 (file)
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -1470,6 +1470,12 @@ class TestIdempotent(TestEmailBase):
         self._idempotent(msg, text)
 
     def test_more_rfc2231_parameters(self):
+        # BAW: What to do about this.  Python 2.1 doesn't know about the
+        # charset ansi-x3.4-1968, so this test will fail.  Do we teach Python
+        # about that charset, and if so, where (maybe Charset.py)?  For now,
+        # just skip this test if we aren't at least in Python 2.2.
+        if sys.hexversion < 0x20200000:
+            return
         msg, text = self._msgobj('msg_33.txt')
         self._idempotent(msg, text)
 
@@ -2252,6 +2258,12 @@ Do you like this message?
 """)
 
     def test_rfc2231_get_content_charset(self):
+        # BAW: What to do about this.  Python 2.1 doesn't know about the
+        # charset ansi-x3.4-1968, so this test will fail.  Do we teach Python
+        # about that charset, and if so, where (maybe Charset.py)?  For now,
+        # just skip this test if we aren't at least in Python 2.2.
+        if sys.hexversion < 0x20200000:
+            return
         eq = self.assertEqual
         msg = self._msgobj('msg_32.txt')
         eq(msg.get_content_charset(), 'us-ascii')