Merge with 3.4

terryjreedy · terryjreedy · commit cd41e8937794 · 2014-06-13T15:21:01.000-04:00
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -1461,6 +1461,7 @@ def testFilter(self):
 
 
 @unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.')
+@unittest.skipUnless(thread, 'Threading required for this test.')
 class CANTest(ThreadedCANSocketTest):
 
     def __init__(self, methodName='runTest'):
