Convert the socket module to insist on bytes for input, and to return bytes
(not bytearray) on output. Discovered a bunch of places that were still
depending on it accepting text strings.
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index dde9504..f0b5dea 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -139,7 +139,7 @@
# not.
#request_handler.send_header('Connection', 'close')
request_handler.end_headers()
- request_handler.wfile.write("Proxy Authentication Required.")
+ request_handler.wfile.write(b"Proxy Authentication Required.")
return False
def handle_request(self, request_handler):
@@ -210,9 +210,10 @@
self.send_response(200, "OK")
self.send_header("Content-Type", "text/html")
self.end_headers()
- self.wfile.write("You've reached %s!<BR>" % self.path)
- self.wfile.write("Our apologies, but our server is down due to "
- "a sudden zombie invasion.")
+ self.wfile.write(bytes("You've reached %s!<BR>" % self.path,
+ "ascii"))
+ self.wfile.write(b"Our apologies, but our server is down due to "
+ b"a sudden zombie invasion.")
# Test cases