Issue #7449, last part (11): fix many tests if thread support is disabled

 * Use try/except ImportError or test_support.import_module() to import thread
   and threading modules
 * Add @unittest.skipUnless(threading, ...) to testcases using threads

1 files changed, 5 insertions, 1 deletions

diff --git a/Lib/test/test_file2k.py b/Lib/test/test_file2k.py
index a7681a9..accdc95 100644
--- a/Lib/test/test_file2k.py
+++ b/Lib/test/test_file2k.py
@@ -3,9 +3,12 @@ import os
 import unittest
 import itertools
 import time
-import threading
 from array import array
 from weakref import proxy
+try:
+    import threading
+except ImportError:
+    threading = None
 
 from test import test_support
 from test.test_support import TESTFN, run_unittest
@@ -411,6 +414,7 @@ class FileSubclassTests(unittest.TestCase):
         self.assertTrue(f.subclass_closed)
 
 
+@unittest.skipUnless(threading, 'Threading required for this test.')
 class FileThreadingTests(unittest.TestCase):
     # These tests check the ability to call various methods of file objects
     # (including close()) concurrently without crashing the Python interpreter.