summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Include/pythonrun.h2
-rw-r--r--Python/ceval.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 95ac15c..6d3a6d8 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -8,6 +8,8 @@ extern "C" {
#endif
#define PyCF_MASK (CO_GENERATOR_ALLOWED | CO_FUTURE_DIVISION)
+#define PyCF_MASK_OBSOLETE (CO_NESTED)
+
typedef struct {
int cf_flags; /* bitmask of CO_xxx flags relevant to future */
} PyCompilerFlags;
diff --git a/Python/ceval.c b/Python/ceval.c
index 6ee8ae3..d3898fb 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2928,13 +2928,10 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
if (current_frame != NULL) {
const int codeflags = current_frame->f_code->co_flags;
- if (codeflags & CO_NESTED) {
+ const int compilerflags = codeflags & PyCF_MASK;
+ if (compilerflags) {
result = 1;
- cf->cf_flags |= CO_NESTED;
- }
- if (codeflags & CO_GENERATOR_ALLOWED) {
- result = 1;
- cf->cf_flags |= CO_GENERATOR_ALLOWED;
+ cf->cf_flags |= compilerflags;
}
}
return result;