Merge #19092 from 3.3

diff --cc Lib/contextlib.py
Simple merge

diff --cc Lib/test/test_contextlib.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 91d402981f35398a5d5a2f2411bf3b3733f6db65,30e61117fe3969d791814783400c23676fe384cf..444a0426d5876e8cc60e521a9b618c3003793cfe
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,43 -12,61 +10,47 @@@ Projected release date: 2013-10-2
  Core and Builtins
  -----------------
  
 -- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 -  absurdly high.
 -
 -- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
 -
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 -
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 -
 -- Issue #16741: Fix an error reporting in int().
 -
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 +Library
 +-------
  
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
++- Issue #19092: contextlib.ExitStack now correctly reraises exceptions
++  from the __exit__ callbacks of inner context managers (Patch by Hrvoje
++  Nikšić)
+ 
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
 +- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except
 +  when necessary.  Patch by Oscar Benjamin.
  
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 +- Issue #5845: In site.py, only load readline history from ~/.python_history
 +  if no history has been read already.  This avoids double writes to the
 +  history file at shutdown.
  
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 +- Properly initialize all fields of a SSL object after allocation.
  
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 +- Issue #19095: SSLSocket.getpeercert() now raises ValueError when the
 +  SSL handshake hasn't been done.
  
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 +- Issue #4366: Fix building extensions on all platforms when --enable-shared
 +  is used.
  
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 +Build
 +-----
  
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 +- Issue #19130: Correct PCbuild/readme.txt, Python 3.3 and 3.4 require VS 2010.
  
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
  
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 +What's New in Python 3.4.0 Alpha 3?
 +===================================
  
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
 +Release date: 2013-09-29
  
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
  
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +Core and Builtins
 +-----------------
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 +  absurdly high.
  
  Library
  -------