[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3.

[stefan.krah]

http://hg.python.org/cpython/rev/cb297930d2cf
changeset:   81567:cb297930d2cf
parent:      81564:0e191a9d9a13
parent:      81566:cd54b48946ca
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Jan 17 23:36:08 2013 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_threading.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -451,7 +451,8 @@
     # #12316 and #11870), and fork() from a worker thread is known to trigger
     # problems with some operating systems (issue #3863): skip problematic tests
     # on platforms known to behave badly.
-    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5')
+    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+                         'hp-ux11')
 
     def _run_and_join(self, script):
         script = """if 1:

-- 
Repository URL: http://hg.python.org/cpython