]> granicus.if.org Git - python/commitdiff
Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out
authorThomas Wouters <thomas@python.org>
Tue, 28 Feb 2006 20:02:27 +0000 (20:02 +0000)
committerThomas Wouters <thomas@python.org>
Tue, 28 Feb 2006 20:02:27 +0000 (20:02 +0000)
in multiple places. This makes compile()/eval()/etc also inherit the
absolute-import codeflag, like division and with-statement already were.

Python/compile.c

index 13e0f6d34d79fb08696674f645fc865d9a42ee22..9547992957eef11697f639c650819ed27e9daaa6 100644 (file)
@@ -4284,10 +4284,10 @@ compute_code_flags(struct compiler *c)
                flags |= CO_VARKEYWORDS;
        if (ste->ste_generator)
                flags |= CO_GENERATOR;
-        if (c->c_flags->cf_flags & CO_FUTURE_DIVISION)
-                flags |= CO_FUTURE_DIVISION;
-        if (c->c_flags->cf_flags & CO_FUTURE_WITH_STATEMENT)
-                flags |= CO_FUTURE_WITH_STATEMENT;
+
+       /* (Only) inherit compilerflags in PyCF_MASK */
+        flags |= (c->c_flags->cf_flags & PyCF_MASK);
+
        n = PyDict_Size(c->u->u_freevars);
        if (n < 0)
            return -1;