summaryrefslogtreecommitdiffstats
path: root/Python/future.c
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 /Python/future.c
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 'Python/future.c')
-rw-r--r--Python/future.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/future.c b/Python/future.c
index da56dfb..0a87b10 100644
--- a/Python/future.c
+++ b/Python/future.c
@@ -29,6 +29,8 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename)
continue;
} else if (strcmp(feature, FUTURE_DIVISION) == 0) {
ff->ff_features |= CO_FUTURE_DIVISION;
+ } else if (strcmp(feature, FUTURE_ABSIMPORT) == 0) {
+ ff->ff_features |= CO_FUTURE_ABSIMPORT;
} else if (strcmp(feature, "braces") == 0) {
PyErr_SetString(PyExc_SyntaxError,
"not a chance");