Index: Doc/library/socket.rst =================================================================== --- Doc/library/socket.rst (revision 74542) +++ Doc/library/socket.rst (working copy) @@ -830,7 +830,7 @@ while 1: data = conn.recv(1024) if not data: break - conn.send(data) + conn.sendall(data) conn.close() :: @@ -842,7 +842,7 @@ PORT = 50007 # The same port as used by the server s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect((HOST, PORT)) - s.send('Hello, world') + s.sendall('Hello, world') data = s.recv(1024) s.close() print 'Received', repr(data) @@ -885,7 +885,7 @@ while 1: data = conn.recv(1024) if not data: break - conn.send(data) + conn.sendall(data) conn.close() :: @@ -914,7 +914,7 @@ if s is None: print 'could not open socket' sys.exit(1) - s.send('Hello, world') + s.sendall('Hello, world') data = s.recv(1024) s.close() print 'Received', repr(data) Index: Doc/library/socketserver.rst =================================================================== --- Doc/library/socketserver.rst (revision 74542) +++ Doc/library/socketserver.rst (working copy) @@ -356,7 +356,7 @@ print "%s wrote:" % self.client_address[0] print self.data # just send back the same data, but upper-cased - self.request.send(self.data.upper()) + self.request.sendall(self.data.upper()) if __name__ == "__main__": HOST, PORT = "localhost", 9999 @@ -386,7 +386,7 @@ The difference is that the ``readline()`` call in the second handler will call ``recv()`` multiple times until it encounters a newline character, while the single ``recv()`` call in the first handler will just return what has been sent -from the client in one ``send()`` call. +from the client in one ``sendall()`` call. This is the client side:: @@ -402,7 +402,7 @@ # Connect to server and send data sock.connect((HOST, PORT)) - sock.send(data + "\n") + sock.sendall(data + "\n") # Receive data from the server and shut down received = sock.recv(1024) @@ -499,7 +499,7 @@ data = self.request.recv(1024) cur_thread = threading.currentThread() response = "%s: %s" % (cur_thread.getName(), data) - self.request.send(response) + self.request.sendall(response) class ThreadedTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): pass @@ -507,7 +507,7 @@ def client(ip, port, message): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((ip, port)) - sock.send(message) + sock.sendall(message) response = sock.recv(1024) print "Received: %s" % response sock.close()