[Python-checkins] cpython (merge 3.2 -> 3.2): Merge

Tue Aug 23 19:52:10 CEST 2011

http://hg.python.org/cpython/rev/5910168d14b0
changeset: 72053:5910168d14b0
branch: 3.2
parent: 72051:5b2f357989bb
parent: 72048:9157a9e77740
user: Antoine Pitrou <solipsis at pitrou.net>
date: Tue Aug 23 19:49:13 2011 +0200
summary:
 Merge
files:
 Lib/test/test_fcntl.py | 8 ++------
 Misc/NEWS | 6 ++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -23,12 +23,8 @@
 else:
 start_len = "qq"
 
- if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
- 'Darwin1.2', 'darwin',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'freebsd6', 'freebsd7', 'freebsd8',
- 'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
+ if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd', 'bsdos'))
+ or sys.platform == 'darwin'):
 if struct.calcsize('l') == 8:
 off_t = 'l'
 pid_t = 'i'
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,12 @@
 - Issue #12650: Fix a race condition where a subprocess.Popen could leak
 resources (FD/zombie) when killed at the wrong time.
 
+Tests
+-----
+
+- Issue #12821: Fix test_fcntl failures on OpenBSD 5.
+
+
 What's New in Python 3.2.2?
 ===========================
 
-- 
Repository URL: http://hg.python.org/cpython
