From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 23 Feb 2013 04:33:51 +0000 (+0200)
Subject: #17249: check for the availability of the thread module.
X-Git-Tag: v2.7.4rc1~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef1db54ac138a7d850b60a1f623805f5c4f1f7d7;p=thirdparty%2FPython%2Fcpython.git

#17249: check for the availability of the thread module.
---

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index daeae393cac6..0edb3bf4836c 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -4,13 +4,14 @@
 from __future__ import with_statement
 import sys
 import time
-import thread
 import random
 import unittest
 from test import test_support
 try:
+    import thread
     import threading
 except ImportError:
+    thread = None
     threading = None
 import _testcapi
 
@@ -97,7 +98,7 @@ class TestPendingCalls(unittest.TestCase):
         self.pendingcalls_wait(l, n)
 
 
-@unittest.skipUnless(threading, 'Threading required for this test.')
+@unittest.skipUnless(threading and thread, 'Threading required for this test.')
 class TestThreadState(unittest.TestCase):
 
     @test_support.reap_threads