From 73cbe7a01a22d02dbe1ec841e8779c775cad3d08 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 29 May 2018 12:04:55 +0300 Subject: bpo-32911: Revert bpo-29463. (GH-7121) (GH-7197) Remove the docstring attribute of AST types and restore docstring expression as a first stmt in their body. Co-authored-by: INADA Naoki --- Python/future.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Python/future.c') diff --git a/Python/future.c b/Python/future.c index ade647f25b..03a97c865a 100644 --- a/Python/future.c +++ b/Python/future.c @@ -63,6 +63,7 @@ static int future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename) { int i, done = 0, prev_line = 0; + stmt_ty first; if (!(mod->kind == Module_kind || mod->kind == Interactive_kind)) return 1; @@ -78,7 +79,15 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename) but is preceded by a regular import. */ - for (i = 0; i < asdl_seq_LEN(mod->v.Module.body); i++) { + i = 0; + first = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i); + if (first->kind == Expr_kind + && (first->v.Expr.value->kind == Str_kind + || (first->v.Expr.value->kind == Constant_kind + && PyUnicode_CheckExact(first->v.Expr.value->v.Constant.value)))) + i++; + + for (; i < asdl_seq_LEN(mod->v.Module.body); i++) { stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i); if (done && s->lineno > prev_line) -- cgit v1.2.1