summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-07-20 18:01:34 (GMT)
committerBrett Cannon <brett@python.org>2012-07-20 18:01:34 (GMT)
commitba52586f764693e8d200cd2e8d3faf978777c4d2 (patch)
tree83296d73170480f6a5455d15a34ffb2338ef719d /Lib
parentbe7e49fd820318509cd8b4dbde479c552f74ef62 (diff)
downloadcpython-ba52586f764693e8d200cd2e8d3faf978777c4d2.zip
cpython-ba52586f764693e8d200cd2e8d3faf978777c4d2.tar.gz
cpython-ba52586f764693e8d200cd2e8d3faf978777c4d2.tar.bz2
Running the importlib tests from test_import is redundant as there is
no difference anymore between __import__ and importlib.__import__.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_import.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 51b52c7..1accd7e 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -2,7 +2,6 @@
import importlib
import builtins
import imp
-from importlib.test.import_ import test_suite as importlib_import_test_suite
from importlib.test.import_ import util as importlib_util
import marshal
import os
@@ -881,18 +880,12 @@ class ImportTracebackTests(unittest.TestCase):
def test_main(verbose=None):
- flag = importlib_util.using___import__
- try:
- importlib_util.using___import__ = True
- run_unittest(ImportTests, PycacheTests,
- PycRewritingTests, PathsTests, RelativeImportTests,
- OverridingImportBuiltinTests,
- ImportlibBootstrapTests,
- TestSymbolicallyLinkedPackage,
- ImportTracebackTests,
- importlib_import_test_suite())
- finally:
- importlib_util.using___import__ = flag
+ run_unittest(ImportTests, PycacheTests,
+ PycRewritingTests, PathsTests, RelativeImportTests,
+ OverridingImportBuiltinTests,
+ ImportlibBootstrapTests,
+ TestSymbolicallyLinkedPackage,
+ ImportTracebackTests)
if __name__ == '__main__':