Merge

Lib/test/test_fcntl.py

@@ -23,12 +23,8 @@ def get_lockdata():
     else:
         start_len = "qq"
 
-    if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
+    if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd', 'bsdos'))
-                        'Darwin1.2', 'darwin',
+        or sys.platform == 'darwin'):
-                        'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                        'freebsd6', 'freebsd7', 'freebsd8',
-                        'bsdos2', 'bsdos3', 'bsdos4',
-                        'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
         if struct.calcsize('l') == 8:
             off_t = 'l'
             pid_t = 'i'

Misc/NEWS

@@ -34,6 +34,12 @@ Library
 - 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?
 ===========================