Author: Brian Kearns <[email protected]>
Branch:
Changeset: r69998:10525853b510
Date: 2014-03-16 23:30 -0400
http://bitbucket.org/pypy/pypy/changeset/10525853b510/
Log: fix f777f3fcf74a, add socket subclass test
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
@@ -539,7 +539,6 @@
sock = space.allocate_instance(W_RSocket, w_subtype)
try:
W_RSocket.__init__(sock, family, type, proto)
- sock = W_RSocket(family, type, proto)
except SocketError, e:
raise converted_error(space, e)
return space.wrap(sock)
diff --git a/pypy/module/_socket/test/test_sock_app.py
b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -399,7 +399,7 @@
name = s.getpeername() # Will raise socket.error if not connected
assert name[1] == 80
s.close()
-
+
def test_socket_connect_ex(self):
import _socket
s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM, 0)
@@ -474,6 +474,13 @@
import socket
s = socket.socket()
+ def test_subclass(self):
+ from _socket import socket
+ class MySock(socket):
+ blah = 123
+ s = MySock()
+ assert s.blah == 123
+
def test_getsetsockopt(self):
import _socket as socket
import struct
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
