[Python-checkins] python/dist/src/Lib/email/test test_email.py,1.15,1.16

barry@users.sourceforge.net barry@users.sourceforge.net
Mon, 30 Sep 2002 08:23:19 -0700


Update of /cvsroot/python/python/dist/src/Lib/email/test
In directory usw-pr-cvs1:/tmp/cvs-serv14749/email/test

Modified Files:
	test_email.py 
Log Message:
The ansi_x3.4_1968 encoding is an alias for ascii, but isn't known in
Python 2.1.3.  However it's required by the email tests suite, so poke
it into the encodings aliases if it's missing.  The is apparently the
approved API for doing so.

Now we can remove the hexversion shortcircuits in the test suite.


Index: test_email.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/test/test_email.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_email.py	28 Sep 2002 21:22:52 -0000	1.15
--- test_email.py	30 Sep 2002 15:23:17 -0000	1.16
***************
*** 1471,1480 ****
  
      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)
--- 1471,1474 ----
***************
*** 2259,2268 ****
  
      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')
--- 2253,2256 ----