summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-02-27 23:24:48 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-02-27 23:24:48 (GMT)
commit0023a2f858e62ad364156c008a3f79d6ae32d1c8 (patch)
tree0b780988a6d4a789dd0820e707ecb7a0df26fd4e
parent1d519e4625ad5ea910617413687f13b765f32e99 (diff)
downloadcpython-0023a2f858e62ad364156c008a3f79d6ae32d1c8.zip
cpython-0023a2f858e62ad364156c008a3f79d6ae32d1c8.tar.gz
cpython-0023a2f858e62ad364156c008a3f79d6ae32d1c8.tar.bz2
Finish removal of CO_GENERATOR_ALLOWED.
-rw-r--r--Lib/__future__.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/__future__.py b/Lib/__future__.py
index 8940a95..fc47459 100644
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -60,7 +60,7 @@ __all__ = ["all_feature_names"] + all_feature_names
# they're not exported in __all__, because they don't really belong to
# this module.
CO_NESTED = 0x0010 # nested_scopes
-CO_GENERATOR_ALLOWED = 0x1000 # generators
+CO_GENERATOR_ALLOWED = 0 # generators (obsolete, was 0x1000)
CO_FUTURE_DIVISION = 0x2000 # division
class _Feature:
diff --git a/Misc/NEWS b/Misc/NEWS
index 6738809..4e16038 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.5 alpha 1?
Core and builtins
-----------------
+- CO_GENERATOR_ALLOWED is no longer defined, this behavior is the default.
+ The name was removed from Include/code.h.
+
- PEP 308: conditional expressions were added (x if cond else y).
- Patch 1433928: