Merge 3.3.

This commit is contained in:
Stefan Krah 2012-10-01 23:30:32 +02:00
commit ca1232f7db

View file

@ -225,11 +225,9 @@ class ThreadedImportTests(unittest.TestCase):
@reap_threads @reap_threads
def test_main(): def test_main():
old_switchinterval = None 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: try:
old_switchinterval = sys.getswitchinterval() old_switchinterval = sys.getswitchinterval()
sys.setswitchinterval(new_switchinterval) sys.setswitchinterval(1e-5)
except AttributeError: except AttributeError:
pass pass
try: try: