summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_importhooks.py
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-02-28 16:09:29 (GMT)
committerThomas Wouters <thomas@python.org>2006-02-28 16:09:29 (GMT)
commitf7f438ba3b05eb4356e7511401686b07d9dfb6d8 (patch)
tree94010633418aaf2ea19c609139f9499bf57a1058 /Lib/test/test_importhooks.py
parentd3188639c32a086e9149b92d875c45408bd8b81c (diff)
downloadcpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.zip
cpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.tar.gz
cpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.tar.bz2
SF patch #1438387, PEP 328: relative and absolute imports.
- IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
Diffstat (limited to 'Lib/test/test_importhooks.py')
-rw-r--r--Lib/test/test_importhooks.py40
1 files changed, 40 insertions, 0 deletions
diff --git a/Lib/test/test_importhooks.py b/Lib/test/test_importhooks.py
index 9304213..c580755 100644
--- a/Lib/test/test_importhooks.py
+++ b/Lib/test/test_importhooks.py
@@ -12,6 +12,10 @@ def get_file():
return __file__
"""
+absimp = "import sub\n"
+relimp = "from . import sub\n"
+futimp = "from __future__ import absolute_import\n"
+
reload_src = test_src+"""\
reloaded = True
"""
@@ -19,6 +23,11 @@ reloaded = True
test_co = compile(test_src, "<???>", "exec")
reload_co = compile(reload_src, "<???>", "exec")
+test2_oldabs_co = compile(absimp + test_src, "<???>", "exec")
+test2_newabs_co = compile(futimp + absimp + test_src, "<???>", "exec")
+test2_newrel_co = compile(relimp + test_src, "<???>", "exec")
+test2_futrel_co = compile(futimp + relimp + test_src, "<???>", "exec")
+
test_path = "!!!_test_!!!"
@@ -38,6 +47,11 @@ class TestImporter:
"hooktestpackage": (True, test_co),
"hooktestpackage.sub": (True, test_co),
"hooktestpackage.sub.subber": (False, test_co),
+ "hooktestpackage.oldabs": (False, test2_oldabs_co),
+ "hooktestpackage.newabs": (False, test2_newabs_co),
+ "hooktestpackage.newrel": (False, test2_newrel_co),
+ "hooktestpackage.futrel": (False, test2_futrel_co),
+ "sub": (False, test_co),
"reloadmodule": (False, test_co),
}
@@ -176,6 +190,32 @@ class ImportHooksTestCase(ImportHooksBaseTestCase):
TestImporter.modules['reloadmodule'] = (False, reload_co)
reload(reloadmodule)
self.failUnless(hasattr(reloadmodule,'reloaded'))
+
+ import hooktestpackage.oldabs
+ self.assertEqual(hooktestpackage.oldabs.get_name(),
+ "hooktestpackage.oldabs")
+ self.assertEqual(hooktestpackage.oldabs.sub,
+ hooktestpackage.sub)
+
+ import hooktestpackage.newrel
+ self.assertEqual(hooktestpackage.newrel.get_name(),
+ "hooktestpackage.newrel")
+ self.assertEqual(hooktestpackage.newrel.sub,
+ hooktestpackage.sub)
+
+ import hooktestpackage.futrel
+ self.assertEqual(hooktestpackage.futrel.get_name(),
+ "hooktestpackage.futrel")
+ self.assertEqual(hooktestpackage.futrel.sub,
+ hooktestpackage.sub)
+
+ import sub
+ self.assertEqual(sub.get_name(), "sub")
+
+ import hooktestpackage.newabs
+ self.assertEqual(hooktestpackage.newabs.get_name(),
+ "hooktestpackage.newabs")
+ self.assertEqual(hooktestpackage.newabs.sub, sub)
def testMetaPath(self):
i = MetaImporter()