From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Mon, 19 Mar 2012 04:13:13 +0000 (+0200)
Subject: Merge with 3.2 for #14359.
X-Git-Tag: v3.3.0a2~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d3a575fc1b1fe292147ba2b7665c019b3c8e59b;p=python

Merge with 3.2 for #14359.
---

6d3a575fc1b1fe292147ba2b7665c019b3c8e59b
diff --cc Misc/ACKS
index eeb61e08e0,77cec5c645..2cd02bf35e
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -186,8 -172,8 +186,9 @@@ Chris Clar
  Mike Clarkson
  Andrew Clegg
  Brad Clements
 +Robbie Clemons
  Steve Clift
+ Hervé Coatanhay
  Nick Coghlan
  Josh Cogliati
  Dave Cole
diff --cc Misc/NEWS
index 93fb4bd5d9,40b17fc87f..f03aeb5c1a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -129,12 -81,20 +129,15 @@@ Librar
  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.
  
 -What's New in Python 3.2.3 release candidate 2?
 -===============================================
 -
 -*Release date: XX-Mar-2012*
 +- Issue #14324: Fix configure tests for cross builds.
  
 -Library
 --------
 -
 -- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils
 -  on Windows.
 +- Issue #14327: Call AC_CANONICAL_HOST in configure.ac and check in
 +  config.{guess,sub}. Don't use uname calls for cross builds.
  
  Extension Modules
  -----------------