Author: Brian Kearns <[email protected]>
Branch:
Changeset: r69768:0b343f4144e4
Date: 2014-03-06 19:34 -0500
http://bitbucket.org/pypy/pypy/changeset/0b343f4144e4/
Log: transplant simplifications to test_select from py3k
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -43,7 +43,7 @@
try:
iwtd, owtd, ewtd = select.select([readend], [], [], 0)
assert iwtd == owtd == ewtd == []
- writeend.send('X')
+ writeend.send(b'X')
iwtd, owtd, ewtd = select.select([readend], [], [])
assert iwtd == [readend]
assert owtd == ewtd == []
@@ -84,7 +84,7 @@
if owtd == []:
break
assert owtd == [writeend]
- total_out += writeend.send('x' * 512)
+ total_out += writeend.send(b'x' * 512)
total_in = 0
while True:
iwtd, owtd, ewtd = select.select([readend], [], [], 0)
@@ -94,7 +94,7 @@
assert iwtd == [readend]
data = readend.recv(4096)
assert len(data) > 0
- assert data == 'x' * len(data)
+ assert data == b'x' * len(data)
total_in += len(data)
assert total_in == total_out
finally:
@@ -110,7 +110,7 @@
readend, writeend = self.getpair()
try:
try:
- total_out = writeend.send('x' * 512)
+ total_out = writeend.send(b'x' * 512)
finally:
# win32 sends the 'closed' event immediately, even when
# more data is available
@@ -126,7 +126,7 @@
data = readend.recv(4096)
if len(data) == 0:
break
- assert data == 'x' * len(data)
+ assert data == b'x' * len(data)
total_in += len(data)
# win32: check that closing the socket exits the loop
if sys.platform == 'win32' and total_in == total_out:
@@ -171,12 +171,12 @@
for i in range(50):
n = (i*3) % 10
- writeends[n].send('X')
+ writeends[n].send(b'X')
iwtd, owtd, ewtd = select.select(readends, [], [])
assert iwtd == [readends[n]]
assert owtd == ewtd == []
data = readends[n].recv(1)
- assert data == 'X'
+ assert data == b'X'
finally:
for fd in readends + writeends:
@@ -251,34 +251,30 @@
"usemodules": ["select", "_socket", "rctime", "thread"],
}
- def setup_class(cls):
- space = cls.space
- w_import = space.getattr(space.builtin, space.wrap("__import__"))
- w_socketmod = space.call_function(w_import, space.wrap("socket"))
- cls.w_sock = cls.space.call_method(w_socketmod, "socket")
- cls.w_sock_err = space.getattr(w_socketmod, space.wrap("error"))
-
- try_ports = [1023] + range(20000, 30000, 437)
+ def w_make_server(self):
+ import socket
+ if hasattr(self, 'sock'):
+ return self.sock
+ self.sock = socket.socket()
+ try_ports = [1023] + list(range(20000, 30000, 437))
for port in try_ports:
- print 'binding to port %d:' % (port,),
- cls.w_sockaddress = space.wrap(('127.0.0.1', port))
+ print('binding to port %d:' % (port,))
+ self.sockaddress = ('127.0.0.1', port)
try:
- space.call_method(cls.w_sock, "bind", cls.w_sockaddress)
+ self.sock.bind(self.sockaddress)
break
- except OperationError, e: # should get a "Permission denied"
- if not e.match(space, space.getattr(w_socketmod,
space.wrap("error"))):
- raise
- print e.errorstr(space)
- except cls.w_sock_err, e: # should get a "Permission denied"
- print e
+ except socket.error as e: # should get a "Permission denied"
+ print(e)
else:
- raise e
+ raise(e)
def w_getpair(self):
"""Helper method which returns a pair of connected sockets."""
import socket
import thread
+ self.make_server()
+
self.sock.listen(1)
s2 = socket.socket()
thread.start_new_thread(s2.connect, (self.sockaddress,))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
