summaryrefslogtreecommitdiff
path: root/Python/future.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
committerBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
commitc16b8b405e790c04e4062a4b1231ba56387e4273 (patch)
tree7e6120af47d7413550634e652c8e827603c5c615 /Python/future.c
parent07929c5f6dd69c554889910bf5988ad6c31f5593 (diff)
parent65e767b0df52dd8262d49f3c1ea1ae3567bb4d47 (diff)
downloadcpython-c16b8b405e790c04e4062a4b1231ba56387e4273.tar.gz
merge 3.4 (#24806)
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");