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

[stefan.krah]

http://hg.python.org/cpython/rev/112103a4241a
changeset:   79384:112103a4241a
parent:      79382:a19f47d380d2
parent:      79383:484a4b9349af
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Oct 01 23:30:32 2012 +0200
summary:
  Merge 3.3.

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


diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -225,11 +225,9 @@
 @reap_threads
 def test_main():
     old_switchinterval = None
-    # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1.
-    new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001
     try:
         old_switchinterval = sys.getswitchinterval()
-        sys.setswitchinterval(new_switchinterval)
+        sys.setswitchinterval(1e-5)
     except AttributeError:
         pass
     try:

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