]> granicus.if.org Git - python/commitdiff
Running the importlib tests from test_import is redundant as there is
authorBrett Cannon <brett@python.org>
Fri, 20 Jul 2012 18:01:34 +0000 (14:01 -0400)
committerBrett Cannon <brett@python.org>
Fri, 20 Jul 2012 18:01:34 +0000 (14:01 -0400)
no difference anymore between __import__ and importlib.__import__.

Lib/test/test_import.py

index 51b52c7e0b605199c28f5dd737a284e2a24ce497..1accd7e30e069beb57c169223edba50920e86e28 100644 (file)
@@ -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__':