diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-03-30 15:04:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-03-30 15:04:16 (GMT) |
| commit | ded31c47af85e51ff17a0f8539a0507d791a4c71 (patch) | |
| tree | d977e1d4cb12b38e12c8c0604ba25b67bb46af42 /Lib | |
| parent | 5879d4122afcbc6e3225edb3d09e79116fdaab7a (diff) | |
| download | cpython-ded31c47af85e51ff17a0f8539a0507d791a4c71.zip cpython-ded31c47af85e51ff17a0f8539a0507d791a4c71.tar.gz cpython-ded31c47af85e51ff17a0f8539a0507d791a4c71.tar.bz2 | |
Merged revisions 70656,70668-70669,70671,70701,70703,70706 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70656 | georg.brandl | 2009-03-28 14:33:33 -0500 (Sat, 28 Mar 2009) | 2 lines
Add a script to fixup rst files if the pre-commit hook rejects them.
........
r70668 | benjamin.peterson | 2009-03-28 22:16:57 -0500 (Sat, 28 Mar 2009) | 1 line
a more realistic example
........
r70669 | benjamin.peterson | 2009-03-28 22:31:40 -0500 (Sat, 28 Mar 2009) | 1 line
stop the versionchanged directive from hiding the docs
........
r70671 | benjamin.peterson | 2009-03-28 22:39:58 -0500 (Sat, 28 Mar 2009) | 1 line
fix consistency
........
r70701 | benjamin.peterson | 2009-03-29 17:27:26 -0500 (Sun, 29 Mar 2009) | 1 line
add missing import
........
r70703 | benjamin.peterson | 2009-03-29 21:14:21 -0500 (Sun, 29 Mar 2009) | 1 line
fix import
........
r70706 | benjamin.peterson | 2009-03-30 09:42:23 -0500 (Mon, 30 Mar 2009) | 1 line
add missing import
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/test/test_email_codecs_renamed.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_fork1.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/email/test/test_email_codecs_renamed.py b/Lib/email/test/test_email_codecs_renamed.py index 7122212..acc19c3 100644 --- a/Lib/email/test/test_email_codecs_renamed.py +++ b/Lib/email/test/test_email_codecs_renamed.py @@ -3,7 +3,7 @@ # email package unit tests for (optional) Asian codecs import unittest -from test.support import TestSkipped, run_unittest +from test.support import run_unittest from email.test.test_email import TestEmailBase from email.charset import Charset @@ -15,7 +15,7 @@ from email.message import Message try: str('foo', 'euc-jp') except LookupError: - raise TestSkipped + raise unittest.SkipTest diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py index 057c589..c9f18d9 100644 --- a/Lib/test/test_fork1.py +++ b/Lib/test/test_fork1.py @@ -3,6 +3,7 @@ import os import time +import unittest from test.fork_wait import ForkWait from test.support import run_unittest, reap_children |