summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-10-01 13:28:00 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-10-01 13:28:00 (GMT)
commite6f4631f0839a004c1d272c48811cdbed3e5ac9d (patch)
tree9cb22ea0168de7b6b812c5f1ce4c6e9fbd7360e4 /Misc
parentc13516b0a0fd3142b29e1f354c2080cd52948213 (diff)
parent1a33b2f35b9195b440b492afa87dcf83ba2ecca4 (diff)
downloadcpython-e6f4631f0839a004c1d272c48811cdbed3e5ac9d.zip
cpython-e6f4631f0839a004c1d272c48811cdbed3e5ac9d.tar.gz
cpython-e6f4631f0839a004c1d272c48811cdbed3e5ac9d.tar.bz2
Merge #19092 from 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 5015946..a5d577d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -912,7 +912,7 @@ Samuel Nicolary
Jonathan Niehof
Gustavo Niemeyer
Oscar Nierstrasz
-Hrvoje Niksic
+Hrvoje Nikšić
Gregory Nofi
Jesse Noller
Bill Noon
diff --git a/Misc/NEWS b/Misc/NEWS
index 91d4029..444a042 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,10 @@ Core and Builtins
Library
-------
+- Issue #19092: contextlib.ExitStack now correctly reraises exceptions
+ from the __exit__ callbacks of inner context managers (Patch by Hrvoje
+ Nikšić)
+
- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except
when necessary. Patch by Oscar Benjamin.