mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 04:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#25471)

Browse source
This commit is contained in:
Benjamin Peterson 2015-10-24 20:07:08 -07:00
commit 2775d85d55
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_socket.py
View file

@ -3866,6 +3866,7 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
read, write, err = select.select([self.serv], [], [])
if self.serv in read:
conn, addr = self.serv.accept()
self.assertIsNone(conn.gettimeout())
conn.close()
else:
self.fail("Error trying to do accept after select.")