From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 21 Jul 2002 06:06:30 +0000 (+0000)
Subject: Changed import from
X-Git-Tag: v2.3c1~4904
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53d019cf5ac96bc609781e8a37d97899292ff40d;p=thirdparty%2FPython%2Fcpython.git

Changed import from
    from test.test_support import TestSkipped, run_unittest
to
    from test_support import TestSkipped, run_unittest

Otherwise, if the Japanese codecs aren't installed, regrtest doesn't
believe the TestSkipped exception raised by this test matches the

    except (ImportError, test_support.TestSkipped), msg:

it's looking for, and reports the skip as a crash failure instead of
as a skipped test.

I suppose this will make it harder to run this test outside of
regrtest, but under the assumption only Barry does that, better to
make it skip cleanly for everyone else.
---

diff --git a/Lib/email/test/test_email_codecs.py b/Lib/email/test/test_email_codecs.py
index 0f681519e424..63912efb3788 100644
--- a/Lib/email/test/test_email_codecs.py
+++ b/Lib/email/test/test_email_codecs.py
@@ -2,7 +2,7 @@
 # email package unit tests for (optional) Asian codecs
 
 import unittest
-from test.test_support import TestSkipped, run_unittest
+from test_support import TestSkipped, run_unittest
 
 from email.test.test_email import TestEmailBase
 from email.Charset import Charset