diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-23 17:49:13 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-23 17:49:13 (GMT) |
| commit | 7a084105a0ebd0b309ef9b036e9d7922d6c0c555 (patch) | |
| tree | 631874c4292fc4cdfdfe43cc965e39f6933e7b32 | |
| parent | bcb39d484628f55ffc3205e9ddd0166093695e50 (diff) | |
| parent | 6cea35a8e3e1a8afe2ad763af41c8afc040efed0 (diff) | |
| download | cpython-7a084105a0ebd0b309ef9b036e9d7922d6c0c555.zip cpython-7a084105a0ebd0b309ef9b036e9d7922d6c0c555.tar.gz cpython-7a084105a0ebd0b309ef9b036e9d7922d6c0c555.tar.bz2 | |
Merge
| -rw-r--r-- | Lib/test/test_fcntl.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index 6c64b82..29af99c 100644 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -23,12 +23,8 @@ def get_lockdata(): 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' @@ -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? =========================== |