Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-13 15:21:01 -04:00
parent 82fa90c06f a40e6b0c94
commit cd41e89377
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_socket.py
View File

@ -1461,6 +1461,7 @@ class BasicCANTest(unittest.TestCase):
@unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.') @unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.')
@unittest.skipUnless(thread, 'Threading required for this test.')
class CANTest(ThreadedCANSocketTest): class CANTest(ThreadedCANSocketTest):
def __init__(self, methodName='runTest'): def __init__(self, methodName='runTest'):