mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 07:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

(Merge 3.4) Fix repr(_socket.socket) on Windows 64-bit: don't fail with

Browse source 
OverflowError on closed socket. repr(socket.socket) already works fine.
This commit is contained in:
Victor Stinner 2014-07-26 14:37:57 +02:00
commit 011428e168
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_socket.py
View file

@ -40,6 +40,11 @@ try:
except ImportError:
thread = None
threading = None
try:
import _socket
except ImportError:
_socket = None
def _have_socket_can():
"""Check whether CAN sockets are supported on this host."""
@ -660,6 +665,19 @@ class GeneralModuleTests(unittest.TestCase):
self.assertIn('[closed]', repr(s))
self.assertNotIn('laddr', repr(s))
@unittest.skipUnless(_socket is not None, 'need _socket module')
def test_csocket_repr(self):
s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM)
try:
expected = ('<socket object, fd=%s, family=%s, type=%s, proto=%s>'
% (s.fileno(), s.family, s.type, s.proto))
self.assertEqual(repr(s), expected)
finally:
s.close()
expected = ('<socket object, fd=-1, family=%s, type=%s, proto=%s>'
% (s.family, s.type, s.proto))
self.assertEqual(repr(s), expected)
def test_weakref(self):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
p = proxy(s)