summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_lib2to3.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-07-18 14:35:44 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-07-18 14:35:44 (GMT)
commit5a722409ee2aed97d18f2646a30178171167c028 (patch)
tree22185480dc89d37fa4c560735ec92646177ba1cb /Lib/test/test_lib2to3.py
parent0fefb41bd90e258ccf21bb3b86b9775a12f028e6 (diff)
downloadcpython-5a722409ee2aed97d18f2646a30178171167c028.zip
cpython-5a722409ee2aed97d18f2646a30178171167c028.tar.gz
cpython-5a722409ee2aed97d18f2646a30178171167c028.tar.bz2
Merged revisions 65104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65104 | benjamin.peterson | 2008-07-18 09:26:35 -0500 (Fri, 18 Jul 2008) | 2 lines now that test_lib2to3 actually works and isn't extremely slow, we don't need the lib2to3 resource ........
Diffstat (limited to 'Lib/test/test_lib2to3.py')
-rw-r--r--Lib/test/test_lib2to3.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 3af6afa..9bd4496 100644
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -2,11 +2,7 @@
# because of running
from lib2to3.tests import test_fixers, test_pytree, test_util
import 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')
+from test.support import run_unittest
def suite():
tests = unittest.TestSuite()