[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Fri Jun 13 21:21:26 CEST 2014

http://hg.python.org/cpython/rev/273e3d52c0c9
changeset: 91166:273e3d52c0c9
parent: 91164:c99fc7e965b5
parent: 91165:f44275c66fcf
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Jun 13 15:21:01 2014 -0400
summary:
 Merge with 3.4
files:
 Lib/test/test_socket.py | 1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1461,6 +1461,7 @@
 
 
 @unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.')
+ at unittest.skipUnless(thread, 'Threading required for this test.')
 class CANTest(ThreadedCANSocketTest):
 
 def __init__(self, methodName='runTest'):
-- 
Repository URL: http://hg.python.org/cpython
