diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-06-02 07:41:26 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-06-02 07:41:26 (GMT) |
| commit | 5c91bf3e9304e9878d37c55794b3dcc0669d8ab5 (patch) | |
| tree | ee4293372d075cef634291c6b3ff8e816eeef1ad /Lib | |
| parent | 0a27e3db50193de0881d98f9bc856e18f079974e (diff) | |
| download | cpython-5c91bf3e9304e9878d37c55794b3dcc0669d8ab5.zip cpython-5c91bf3e9304e9878d37c55794b3dcc0669d8ab5.tar.gz cpython-5c91bf3e9304e9878d37c55794b3dcc0669d8ab5.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/socket.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 15d42ca..be019db 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 |