From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 22 Jan 2014 13:04:37 +0000 (+1000)
Subject: Merge #20317 from 3.3
X-Git-Tag: v3.4.0b3~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d58831e6886ce457626448c6c2efd1f4cd05dd3a;p=python

Merge #20317 from 3.3
---

d58831e6886ce457626448c6c2efd1f4cd05dd3a
diff --cc Misc/NEWS
index 56c06ab36f,a89762d850..72ae4fa01d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -32,11 -32,30 +32,17 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #20311: selector.PollSelector.select() now rounds the timeout away from
 +  zero, instead of rounding towards zero. For example, a timeout of one
 +  microsecond is now rounded to one millisecond, instead of being rounded to
 +  zero.
 +
+ - Issue #20317: ExitStack.__exit__ could create a self-referential loop if an
+   exception raised by a cleanup operation already had its context set
+   correctly (for example, by the @contextmanager decorator). The infinite
+   loop this caused is now avoided by checking if the expected context is
+   already set before trying to fix it.
+ 
  - Issue #20311: select.epoll.poll() now rounds the timeout away from zero,
    instead of rounding towards zero. For example, a timeout of one microsecond
    is now rounded to one millisecond, instead of being rounded to zero.