diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-07-05 15:55:00 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-07-05 15:55:00 (GMT) |
| commit | ba32b72be5029437aac83f27507588fe4dde8dbf (patch) | |
| tree | ee74be0d448caf0bc2f6062ab689f014152a3619 /Lib/test/test_lib2to3.py | |
| parent | 0d748c2fa467d6fa0e9c98571b649c57cddc2242 (diff) | |
| download | cpython-ba32b72be5029437aac83f27507588fe4dde8dbf.zip cpython-ba32b72be5029437aac83f27507588fe4dde8dbf.tar.gz cpython-ba32b72be5029437aac83f27507588fe4dde8dbf.tar.bz2 | |
Merged revisions 64736-64737 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r64736 | martin.v.loewis | 2008-07-05 17:45:45 +0200 (Sa, 05 Jul 2008) | 20 lines
Merged revisions 64285-64735 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64493 | benjamin.peterson | 2008-06-24 04:14:14 +0200 (Di, 24 Jun 2008) | 1 line
add a fix_import mapping for cPickle -> pickle
........
r64651 | brett.cannon | 2008-07-02 04:00:11 +0200 (Mi, 02 Jul 2008) | 3 lines
Update fix_imports for urllib. Had to change the fixer itself to handle modules
that are split across several renames in 3.0.
........
r64669 | brett.cannon | 2008-07-02 21:43:48 +0200 (Mi, 02 Jul 2008) | 4 lines
Backing out last change until fix_imports is working again. Also re-enable the
testing for fix_imports; if it is deemed that it takes too long to run then a
random sample should be taken and used to test it.
........
................
r64737 | martin.v.loewis | 2008-07-05 17:48:20 +0200 (Sa, 05 Jul 2008) | 2 lines
Disable lib2to3 by default, unless run explicitly.
................
Diffstat (limited to 'Lib/test/test_lib2to3.py')
| -rw-r--r-- | Lib/test/test_lib2to3.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py index 9bd4496..3af6afa 100644 --- a/Lib/test/test_lib2to3.py +++ b/Lib/test/test_lib2to3.py @@ -2,7 +2,11 @@ # because of running from lib2to3.tests import test_fixers, test_pytree, test_util import unittest -from test.support import run_unittest +from test.support import run_unittest, requires + +# Don't run lib2to3 tests by default since they take too long +if __name__ != '__main__': + requires('lib2to3') def suite(): tests = unittest.TestSuite() |