mirror of
https://github.com/python/cpython.git
synced 2025-10-06 15:11:58 +00:00
Fix issue #17675: make socket repr() provide local and remote addresses (if any).
This commit is contained in:
parent
7d36e4f074
commit
50331cbf08
3 changed files with 40 additions and 9 deletions
|
@ -103,13 +103,32 @@ class socket(_socket.socket):
|
|||
self.close()
|
||||
|
||||
def __repr__(self):
|
||||
"""Wrap __repr__() to reveal the real class name."""
|
||||
s = _socket.socket.__repr__(self)
|
||||
if s.startswith("<socket object"):
|
||||
s = "<%s.%s%s%s" % (self.__class__.__module__,
|
||||
self.__class__.__name__,
|
||||
getattr(self, '_closed', False) and " [closed] " or "",
|
||||
s[7:])
|
||||
"""Wrap __repr__() to reveal the real class name and socket
|
||||
address(es).
|
||||
"""
|
||||
closed = getattr(self, '_closed', False)
|
||||
s = "<%s.%s%s fd=%i, family=%i, type=%i, proto=%i" \
|
||||
% (self.__class__.__module__,
|
||||
self.__class__.__name__,
|
||||
" [closed]" if closed else "",
|
||||
self.fileno(),
|
||||
self.family,
|
||||
self.type,
|
||||
self.proto)
|
||||
if not closed:
|
||||
try:
|
||||
laddr = self.getsockname()
|
||||
if laddr:
|
||||
s += ", laddr=%s" % str(laddr)
|
||||
except error:
|
||||
pass
|
||||
try:
|
||||
raddr = self.getpeername()
|
||||
if raddr:
|
||||
s += ", raddr=%s" % str(raddr)
|
||||
except error:
|
||||
pass
|
||||
s += '>'
|
||||
return s
|
||||
|
||||
def __getstate__(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue