commit c46600d8f2a2f4c924ffac942d7225a53592f45d
author Giampaolo Rodola' <g.rodola@gmail.com> Tue Nov 12 23:09:01 2013 +0100
committer Giampaolo Rodola' <g.rodola@gmail.com> Tue Nov 12 23:09:01 2013 +0100
tree 72e594ec07fa4acf764cb0b76bead655396314a4
parent 1bfa7ed3b08f1176114ffa390702cccda8464750
parent b62814998ab0a1dd16830eaaa4e6e6d8618872e1

merge

Lib/socket.py

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 @@
         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 "",