summaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-11-04 23:53:15 +1000
committerNick Coghlan <ncoghlan@gmail.com>2012-11-04 23:53:15 +1000
commit82363936211bf286f03f9f89ca9639c76f164a45 (patch)
treef990fdd56ff58bd304103d645d0819f21ed9a252 /Misc
parent7515996b6a4e14433327adbd10ff1c8b4097873c (diff)
parentedcdaaa21d40a48b0fad3672f9a532534b935152 (diff)
downloadcpython-82363936211bf286f03f9f89ca9639c76f164a45.tar.gz
Issue #5765: Merge from 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 49081e89ea..aeb7f0fabb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -431,6 +431,7 @@ Hans de Graaff
Nathaniel Gray
Eddy De Greef
Grant Griffin
+Andrea Griffini
Duncan Grisby
Fabian Groffen
Eric Groo
diff --git a/Misc/NEWS b/Misc/NEWS
index 39d97dd0d4..c66bf8a15b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
+- Issue #5765: Apply a hard recursion limit in the compiler instead of
+ blowing the stack and segfaulting.
+
- Issue #16402: When slicing a range, fix shadowing of exceptions from
__index__.