[Python-checkins] r83090 - python/branches/py3k/Lib/test/test_import.py

[brett.cannon]

Author: brett.cannon
Date: Fri Jul 23 16:03:16 2010
New Revision: 83090

Log:
Explicitly test relative imports by reusing importlib tests.

Closes issue 8392. Thanks Virgil Dupras for the initial patch.


Modified:
   python/branches/py3k/Lib/test/test_import.py

Modified: python/branches/py3k/Lib/test/test_import.py
==============================================================================
--- python/branches/py3k/Lib/test/test_import.py	(original)
+++ python/branches/py3k/Lib/test/test_import.py	Fri Jul 23 16:03:16 2010
@@ -1,6 +1,8 @@
 import builtins
 import errno
 import imp
+from importlib.test.import_ import test_relative_imports
+from importlib.test.import_ import util as importlib_util
 import marshal
 import os
 import py_compile
@@ -633,10 +635,21 @@
                          os.path.join(os.curdir, foo_pyc))
 
 
+class RelativeImportTests(test_relative_imports.RelativeImports):
+
+    def setUp(self):
+        self._importlib_util_flag = importlib_util.using___import__
+        importlib_util.using___import__ = True
+
+    def tearDown(self):
+        importlib_util.using___import__ = self._importlib_util_flag
+
+
 def test_main(verbose=None):
     run_unittest(ImportTests, PycacheTests,
                  PycRewritingTests, PathsTests, RelativeImportTests,
-                 OverridingImportBuiltinTests)
+                 OverridingImportBuiltinTests,
+                 RelativeImportTests)
 
 
 if __name__ == '__main__':