[Python-3000-checkins] r56708 - in python/branches/py3k-struni/Lib: SocketServer.py test/test_socketserver.py
guido.van.rossum
python-3000-checkins at python.org
Fri Aug 3 21:03:39 CEST 2007
Author: guido.van.rossum
Date: Fri Aug 3 21:03:39 2007
New Revision: 56708
Modified:
python/branches/py3k-struni/Lib/SocketServer.py
python/branches/py3k-struni/Lib/test/test_socketserver.py
Log:
SF patch# 1764815 by Paul Colomiets.
Fix for test_socketserver.
Use io.BytesIO instead of io.StringIO, and adjust tests.
Modified: python/branches/py3k-struni/Lib/SocketServer.py
==============================================================================
--- python/branches/py3k-struni/Lib/SocketServer.py (original)
+++ python/branches/py3k-struni/Lib/SocketServer.py Fri Aug 3 21:03:39 2007
@@ -574,10 +574,10 @@
"""Define self.rfile and self.wfile for datagram sockets."""
def setup(self):
- from io import StringIO
+ from io import BytesIO
self.packet, self.socket = self.request
- self.rfile = StringIO(self.packet)
- self.wfile = StringIO()
+ self.rfile = BytesIO(self.packet)
+ self.wfile = BytesIO()
def finish(self):
self.socket.sendto(self.wfile.getvalue(), self.client_address)
Modified: python/branches/py3k-struni/Lib/test/test_socketserver.py
==============================================================================
--- python/branches/py3k-struni/Lib/test/test_socketserver.py (original)
+++ python/branches/py3k-struni/Lib/test/test_socketserver.py Fri Aug 3 21:03:39 2007
@@ -38,7 +38,7 @@
self.server_close()
raise
-teststring = "hello world\n"
+teststring = b"hello world\n"
def receive(sock, n, timeout=20):
r, w, x = select.select([sock], [], [], timeout)
@@ -51,7 +51,7 @@
s = socket.socket(proto, socket.SOCK_DGRAM)
s.sendto(teststring, addr)
buf = data = receive(s, 100)
- while data and '\n' not in buf:
+ while data and b'\n' not in buf:
data = receive(s, 100)
buf += data
verify(buf == teststring)
@@ -62,7 +62,7 @@
s.connect(addr)
s.sendall(teststring)
buf = data = receive(s, 100)
- while data and '\n' not in buf:
+ while data and b'\n' not in buf:
data = receive(s, 100)
buf += data
verify(buf == teststring)
More information about the Python-3000-checkins
mailing list