From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 25 Oct 2015 03:07:08 +0000 (-0700)
Subject: merge 3.4 (#25471)
X-Git-Tag: v3.5.1rc1~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2775d85d55a092e3aca9a72bf2e5328d95b0340f;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25471)
---

2775d85d55a092e3aca9a72bf2e5328d95b0340f
diff --cc Misc/NEWS
index 6a2429193554,7d673b2cc29d..7e7534da5076
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -177,21 -188,6 +177,24 @@@ Librar
  - Issue #16180: Exit pdb if file has syntax error, instead of trapping user
    in an infinite loop.  Patch by Xavier de Gaye.
  
 +- Issue #24891: Fix a race condition at Python startup if the file descriptor
 +  of stdin (0), stdout (1) or stderr (2) is closed while Python is creating
 +  sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set
 +  to None if the creation of the object failed, instead of raising an OSError
 +  exception. Initial patch written by Marco Paolini.
 +
 +- Issue #24992: Fix error handling and a race condition (related to garbage
 +  collection) in collections.OrderedDict constructor.
 +
 +- Issue #24881: Fixed setting binary mode in Python implementation of FileIO
 +  on Windows and Cygwin.  Patch from Akira Li.
 +
++- Issue #25471: Sockets returned from accept() shouldn't appear to be
++  nonblocking.
++
 +- Issue #25319: When threading.Event is reinitialized, the underlying condition
 +  should use a regular lock rather than a recursive lock.
 +
  - Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
    Patch from Berker Peksag.