From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 17 Jan 2013 22:36:08 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfc02452a3e49cfaf51a068dc3668c8810a8b8de;p=python

Merge 3.3.
---

bfc02452a3e49cfaf51a068dc3668c8810a8b8de
diff --cc Lib/test/test_threading.py
index 13c017da1d,11e63d3e83..fff00f4bc5
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@@ -451,7 -451,8 +451,8 @@@ class ThreadJoinOnShutdown(BaseTestCase
      # #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',
 -                         'os2emx', 'hp-ux11')
++                         'hp-ux11')
  
      def _run_and_join(self, script):
          script = """if 1: