From: Thomas Wouters <thomas@python.org>
Date: Tue, 28 Feb 2006 20:02:27 +0000 (+0000)
Subject: Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out
X-Git-Tag: v2.5a0~474
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e9f1fa706518e0c5c1052652c9783d4f8672b57;p=thirdparty%2FPython%2Fcpython.git

Generally inehrit codeflags that are in PyCF_MASK, instead of writing it out
in multiple places. This makes compile()/eval()/etc also inherit the
absolute-import codeflag, like division and with-statement already were.
---

diff --git a/Python/compile.c b/Python/compile.c
index 13e0f6d34d79..9547992957ee 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -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;