From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Oct 2015 05:00:33 +0000 (-0700)
Subject: merge 3.4 (#25319)
X-Git-Tag: v3.5.1rc1~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72181b2f5385cc709543250b37d077adf3d08043;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25319)
---

72181b2f5385cc709543250b37d077adf3d08043
diff --cc Misc/NEWS
index 2c1a7c2136cb,70f3a5155a70..66bf5b9e17cf
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -138,18 -171,6 +138,21 @@@ 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 #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.