Skip to content

gh-121272: move __future__ import validation from compiler to symtable #121273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2024
Merged

gh-121272: move __future__ import validation from compiler to symtable #121273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3558be8
remove __future__ import validation from compiler to symtable
iritkatriel Jul 2, 2024
1661310
PEP 7
iritkatriel Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ typedef struct _PyCfgBuilder cfg_builder;
#define LOCATION(LNO, END_LNO, COL, END_COL) \
((const _Py_SourceLocation){(LNO), (END_LNO), (COL), (END_COL)})

/* Return true if loc1 starts after loc2 ends. */
static inline bool
location_is_after(location loc1, location loc2) {
return (loc1.lineno > loc2.end_lineno) ||
((loc1.lineno == loc2.end_lineno) &&
(loc1.col_offset > loc2.end_col_offset));
}

#define LOC(x) SRC_LOCATION_FROM_AST(x)

typedef _PyJumpTargetLabel jump_target_label;
Expand Down Expand Up @@ -3847,14 +3839,6 @@ compiler_from_import(struct compiler *c, stmt_ty s)
PyTuple_SET_ITEM(names, i, Py_NewRef(alias->name));
}

if (location_is_after(LOC(s), c->c_future.ff_location) &&
s->v.ImportFrom.module && s->v.ImportFrom.level == 0 &&
_PyUnicode_EqualToASCIIString(s->v.ImportFrom.module, "__future__"))
{
Py_DECREF(names);
return compiler_error(c, LOC(s), "from __future__ imports must occur "
"at the beginning of the file");
}
ADDOP_LOAD_CONST_NEW(c, LOC(s), names);

if (s->v.ImportFrom.module) {
Expand Down
24 changes: 24 additions & 0 deletions Python/symtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,6 +1660,27 @@ has_kwonlydefaults(asdl_arg_seq *kwonlyargs, asdl_expr_seq *kw_defaults)
return 0;
}

static int
check_import_from(struct symtable *st, stmt_ty s)
{
assert(s->kind == ImportFrom_kind);
_Py_SourceLocation fut = st->st_future->ff_location;
if (s->v.ImportFrom.module && s->v.ImportFrom.level == 0 &&
_PyUnicode_EqualToASCIIString(s->v.ImportFrom.module, "__future__") &&
((s->lineno > fut.lineno) ||
((s->lineno == fut.end_lineno) && (s->col_offset > fut.end_col_offset))))
{
PyErr_SetString(PyExc_SyntaxError,
"from __future__ imports must occur "
"at the beginning of the file");
PyErr_RangedSyntaxLocationObject(st->st_filename,
s->lineno, s->col_offset + 1,
s->end_lineno, s->end_col_offset + 1);
return 0;
}
return 1;
}

static int
symtable_visit_stmt(struct symtable *st, stmt_ty s)
{
Expand Down Expand Up @@ -1914,6 +1935,9 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
break;
case ImportFrom_kind:
VISIT_SEQ(st, alias, s->v.ImportFrom.names);
if (!check_import_from(st, s)) {
VISIT_QUIT(st, 0);
}
break;
case Global_kind: {
Py_ssize_t i;
Expand Down
Loading