[Python-checkins] r42061 - sandbox/trunk/emailpkg/2.5 sandbox/trunk/emailpkg/2.5/testall.py

[barry.warsaw]

Author: barry.warsaw
Date: Mon Jan 16 02:51:48 2006
New Revision: 42061

Modified:
   sandbox/trunk/emailpkg/2.5/   (props changed)
   sandbox/trunk/emailpkg/2.5/testall.py
Log:
Extern in the email package from Python 2.3 for the email 2.5 release.  Also,
simplify the testall.py script.


Modified: sandbox/trunk/emailpkg/2.5/testall.py
==============================================================================
--- sandbox/trunk/emailpkg/2.5/testall.py	(original)
+++ sandbox/trunk/emailpkg/2.5/testall.py	Mon Jan 16 02:51:48 2006
@@ -26,15 +26,9 @@
 
 # See if we have the Japanese codecs package installed
 try:
-    # Python 2.4
-    unicode('foo', 'euc-jp')
-except LookupError:
-    try:
-        unicode('foo', 'japanese.iso-2022-jp')
-    except LookupError:
-        test_email_codecs = None
-else:
     from email.test import test_email_codecs
+except TestSkipped:
+    test_email_codecs = None