mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 13:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

when no module is given in a 'from' relative import, make ImportFrom.module NULL

Browse source
This commit is contained in:
Benjamin Peterson 2009-06-13 20:23:33 +00:00
parent 52c4bec76b
commit a72be3b325
6 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/Python-ast.c
View file

@ -1330,11 +1330,6 @@ ImportFrom(identifier module, asdl_seq * names, int level, int lineno, int
col_offset, PyArena *arena)
{
stmt_ty p;
if (!module) {
PyErr_SetString(PyExc_ValueError,
"field module is required for ImportFrom");
return NULL;
}
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
@ -4273,8 +4268,7 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
Py_XDECREF(tmp);
tmp = NULL;
} else {
PyErr_SetString(PyExc_TypeError, "required field \"module\" missing from ImportFrom");
return 1;
module = NULL;
}
if (PyObject_HasAttrString(obj, "names")) {
int res;

4
Python/ast.c
View file

@ -2440,7 +2440,7 @@ ast_for_import_stmt(struct compiling *c, const node *n)
int n_children;
int idx, ndots = 0;
alias_ty mod = NULL;
identifier modname;
identifier modname = NULL;
/* Count the number of dots (for relative imports) and check for the
optional module name */
@ -2504,8 +2504,6 @@ ast_for_import_stmt(struct compiling *c, const node *n)
}
if (mod != NULL)
modname = mod->name;
else
modname = new_identifier("", c->c_arena);
return ImportFrom(modname, aliases, ndots, lineno, col_offset,
c->c_arena);
}

28
Python/compile.c
View file

@ -1976,6 +1976,13 @@ compiler_from_import(struct compiler *c, stmt_ty s)
PyObject *names = PyTuple_New(n);
PyObject *level;
static PyObject *empty_string;
if (!empty_string) {
empty_string = PyString_FromString("");
if (!empty_string)
return 0;
}
if (!names)
return 0;
@ -1998,23 +2005,24 @@ compiler_from_import(struct compiler *c, stmt_ty s)
PyTuple_SET_ITEM(names, i, alias->name);
}
if (s->lineno > c->c_future->ff_lineno) {
if (!strcmp(PyString_AS_STRING(s->v.ImportFrom.module),
"__future__")) {
Py_DECREF(level);
Py_DECREF(names);
return compiler_error(c,
"from __future__ imports must occur "
if (s->lineno > c->c_future->ff_lineno && s->v.ImportFrom.module &&
!strcmp(PyString_AS_STRING(s->v.ImportFrom.module), "__future__")) {
Py_DECREF(level);
Py_DECREF(names);
return compiler_error(c, "from __future__ imports must occur "
"at the beginning of the file");
}
}
ADDOP_O(c, LOAD_CONST, level, consts);
Py_DECREF(level);
ADDOP_O(c, LOAD_CONST, names, consts);
Py_DECREF(names);
ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
if (s->v.ImportFrom.module) {
ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
}
else {
ADDOP_NAME(c, IMPORT_NAME, empty_string, names);
}
for (i = 0; i < n; i++) {
alias_ty alias = (alias_ty)asdl_seq_GET(s->v.ImportFrom.names, i);
identifier store_name;