summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2013-11-12 22:09:01 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2013-11-12 22:09:01 (GMT)
commitc46600d8f2a2f4c924ffac942d7225a53592f45d (patch)
tree72e594ec07fa4acf764cb0b76bead655396314a4
parent1bfa7ed3b08f1176114ffa390702cccda8464750 (diff)
parentb62814998ab0a1dd16830eaaa4e6e6d8618872e1 (diff)
downloadcpython-c46600d8f2a2f4c924ffac942d7225a53592f45d.zip
cpython-c46600d8f2a2f4c924ffac942d7225a53592f45d.tar.gz
cpython-c46600d8f2a2f4c924ffac942d7225a53592f45d.tar.bz2
merge
-rw-r--r--Lib/socket.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py
index 576ac55..6d67b3d 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -136,7 +136,7 @@ class socket(_socket.socket):
address(es).
"""
closed = getattr(self, '_closed', False)
- s = "<%s.%s%s fd=%i, family=%i, type=%i, proto=%i" \
+ s = "<%s.%s%s fd=%i, family=%s, type=%s, proto=%i" \
% (self.__class__.__module__,
self.__class__.__name__,
" [closed]" if closed else "",