[Python-checkins] cpython (merge default -> default): merge

[giampaolo.rodola]

http://hg.python.org/cpython/rev/8af2dc11464f
changeset:   87076:8af2dc11464f
parent:      87075:63aecf2311cf
parent:      87074:c5751f01b09b
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Nov 12 23:09:01 2013 +0100
summary:
  merge

files:
  Lib/socket.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/socket.py b/Lib/socket.py
--- 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 "",

-- 
Repository URL: http://hg.python.org/cpython