summaryrefslogtreecommitdiff
path: root/Python/future.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-03 06:03:25 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-10-03 06:03:25 +0000
commitba24434c96ff4cbd21d189a4912e536cec4f8cdc (patch)
tree155e4262c4b72c7d4198195f2566efce41ac8b51 /Python/future.c
parent59357b4b8349f52b2c8c92e2da78270e7af9e121 (diff)
parent9a7ccf4627f70e2b26bc9d58d968fecf81d33329 (diff)
downloadcpython-ba24434c96ff4cbd21d189a4912e536cec4f8cdc.tar.gz
Issues #25232, #24657: Merge two CGI server fixes from 3.4 into 3.5
Diffstat (limited to 'Python/future.c')
-rw-r--r--Python/future.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/future.c b/Python/future.c
index 81eab54dd6..163f87f673 100644
--- a/Python/future.c
+++ b/Python/future.c
@@ -40,6 +40,8 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, PyObject *filename)
continue;
} else if (strcmp(feature, FUTURE_BARRY_AS_BDFL) == 0) {
ff->ff_features |= CO_FUTURE_BARRY_AS_BDFL;
+ } else if (strcmp(feature, FUTURE_GENERATOR_STOP) == 0) {
+ ff->ff_features |= CO_FUTURE_GENERATOR_STOP;
} else if (strcmp(feature, "braces") == 0) {
PyErr_SetString(PyExc_SyntaxError,
"not a chance");