summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2012-03-19 04:13:13 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2012-03-19 04:13:13 (GMT)
commit6d3a575fc1b1fe292147ba2b7665c019b3c8e59b (patch)
treea93ccbadaffded7ace79ff58442602f03969fd45 /Misc
parent4ca5661669b1152691c432570a98708dea67b717 (diff)
parent71faefc37e4a74d72e9a56243a085bfddd9209e0 (diff)
downloadcpython-6d3a575fc1b1fe292147ba2b7665c019b3c8e59b.zip
cpython-6d3a575fc1b1fe292147ba2b7665c019b3c8e59b.tar.gz
cpython-6d3a575fc1b1fe292147ba2b7665c019b3c8e59b.tar.bz2
Merge with 3.2 for #14359.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index eeb61e0..2cd02bf 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -188,6 +188,7 @@ Andrew Clegg
Brad Clements
Robbie Clemons
Steve Clift
+Hervé Coatanhay
Nick Coghlan
Josh Cogliati
Dave Cole
diff --git a/Misc/NEWS b/Misc/NEWS
index 93fb4bd..f03aeb5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -129,6 +129,9 @@ Library
Build
-----
+- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.
+ Based on patch from Hervé Coatanhay.
+
- Issue #14321: Do not run pgen during the build if files are up to date.
- Issue #14324: Fix configure tests for cross builds.