summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-07 19:39:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-07 19:39:51 (GMT)
commit3e439797bad59948ff810aeaf7e992b23451ddd6 (patch)
tree130c4172e7d609f3965a814fc751705988c14da7 /Misc
parentce6c525762a91d249f9ff877be5697849a47168e (diff)
parentc41616230211822e838634b84b445f8a124add08 (diff)
downloadcpython-3e439797bad59948ff810aeaf7e992b23451ddd6.zip
cpython-3e439797bad59948ff810aeaf7e992b23451ddd6.tar.gz
cpython-3e439797bad59948ff810aeaf7e992b23451ddd6.tar.bz2
merge 3.4 (#21642)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index caf6c18..62c1be0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ Release date: TBA
Core and Builtins
-----------------
+- Issue #21642: If the conditional if-else expression, allow an integer written
+ with no space between itself and the ``else`` keyword (e.g. ``True if 42else
+ False``) to be valid syntax.
+
- Issue #21523: Fix over-pessimistic computation of the stack effect of
some opcodes in the compiler. This also fixes a quadratic compilation
time issue noticeable when compiling code with a large number of "and"