From 5c91bf3e9304e9878d37c55794b3dcc0669d8ab5 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 2 Jun 2009 07:41:26 +0000 Subject: [PATCH] Merged revisions 73138 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73138 | mark.dickinson | 2009-06-02 08:39:26 +0100 (Tue, 02 Jun 2009) | 1 line Typo in socket.py. Thanks Pablo Torres Navarrete. ........ --- Lib/socket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/socket.py b/Lib/socket.py index 15d42ca317d..be019dbc51a 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -16,7 +16,7 @@ gethostname() -- return the current hostname gethostbyname() -- map a hostname to its IP number gethostbyaddr() -- map an IP number or hostname to DNS info getservbyname() -- map a service name and a protocol name to a port number -getprotobyname() -- mape a protocol name (e.g. 'tcp') to a number +getprotobyname() -- map a protocol name (e.g. 'tcp') to a number ntohs(), ntohl() -- convert 16, 32 bit int from network to host byte order htons(), htonl() -- convert 16, 32 bit int from host to network byte order inet_aton() -- convert IP addr string (123.45.67.89) to 32-bit packed format