Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r88744:5b048af062a4
Date: 2016-11-29 16:17 +0100
http://bitbucket.org/pypy/pypy/changeset/5b048af062a4/
Log: merge heads
diff --git a/pypy/module/_socket/interp_socket.py
b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -216,7 +216,7 @@
def descr_repr(self, space):
fd = intmask(self.sock.fd) # Force to signed type even on Windows.
return space.wrap("<socket object, fd=%d, family=%d,"
- " type=%d, protocol=%d>" %
+ " type=%d, proto=%d>" %
(fd, self.sock.family,
self.sock.type, self.sock.proto))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
