summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2002-09-28 21:22:52 (GMT)
committerBarry Warsaw <barry@python.org>2002-09-28 21:22:52 (GMT)
commitd63071b05fff9b4b151e9d5f62f795f0aba172d8 (patch)
treedc5c800883995fb888117641b8cae874bfd130f7
parenteecdc742f5700d05b086321cb0d68e80498c67cb (diff)
downloadcpython-d63071b05fff9b4b151e9d5f62f795f0aba172d8.zip
cpython-d63071b05fff9b4b151e9d5f62f795f0aba172d8.tar.gz
cpython-d63071b05fff9b4b151e9d5f62f795f0aba172d8.tar.bz2
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).
-rw-r--r--Lib/email/test/test_email.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 4599156..07460b9 100644
--- 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')