diff options
author | Wen Heping <wen@FreeBSD.org> | 2010-11-29 06:29:13 +0000 |
---|---|---|
committer | Wen Heping <wen@FreeBSD.org> | 2010-11-29 06:29:13 +0000 |
commit | 91993cc40defebb177b182415732443cb1b58a2c (patch) | |
tree | de3a83c4228b16f71f2675d0a222edea6f3d8e32 /lang/python27/files | |
parent | - Update to 5.1.1 (diff) |
- Update to 2.7.1
Diffstat (limited to 'lang/python27/files')
-rw-r--r-- | lang/python27/files/patch-Lib-test-test_socket.py | 11 | ||||
-rw-r--r-- | lang/python27/files/patch-Lib-test-test_threading.py (renamed from lang/python27/files/patch-Lib_test_test_threading.py) | 12 |
2 files changed, 6 insertions, 17 deletions
diff --git a/lang/python27/files/patch-Lib-test-test_socket.py b/lang/python27/files/patch-Lib-test-test_socket.py deleted file mode 100644 index 8c1ada8b2da6..000000000000 --- a/lang/python27/files/patch-Lib-test-test_socket.py +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/test/test_socket.py.orig 2010-08-14 16:51:08.542899328 +0800 -+++ Lib/test/test_socket.py 2010-08-14 16:53:25.902184941 +0800 -@@ -334,7 +334,7 @@ - # I've ordered this by protocols that have both a tcp and udp - # protocol, at least for modern Linuxes. - if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -- 'freebsd7', 'freebsd8', 'darwin'): -+ 'freebsd7', 'freebsd8', 'freebsd9', 'darwin'): - # avoid the 'echo' service on this platform, as there is an - # assumption breaking non-standard port/protocol entry - services = ('daytime', 'qotd', 'domain') diff --git a/lang/python27/files/patch-Lib_test_test_threading.py b/lang/python27/files/patch-Lib-test-test_threading.py index c7dec6dd9b87..e6e0647806c7 100644 --- a/lang/python27/files/patch-Lib_test_test_threading.py +++ b/lang/python27/files/patch-Lib-test-test_threading.py @@ -1,11 +1,11 @@ ---- Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 -+++ Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 -@@ -382,7 +382,7 @@ +--- Lib/test/test_threading.py.orig 2010-11-29 08:22:00.000000000 +0800 ++++ Lib/test/test_threading.py 2010-11-29 08:25:21.000000000 +0800 +@@ -476,7 +476,7 @@ return # Skip platforms with known problems forking from a worker thread. # See http://bugs.python.org/issue3863. -- if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'): -+ if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'): +- if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', ++ if sys.platform in ('freebsd6', 'freebsd7', 'freebsd8', 'freebsd9','netbsd5', + 'os2emx'): print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' ' due to known OS bugs on'), sys.platform - return |