[Python-checkins] r73141 - in python/branches/release30-maint: Lib/socket.py

Tue Jun 2 09:42:11 CEST 2009

Author: mark.dickinson
Date: Tue Jun 2 09:42:11 2009
New Revision: 73141
Log:
Merged revisions 73140 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r73140 | mark.dickinson | 2009年06月02日 08:41:26 +0100 (2009年6月02日) | 9 lines
 
 Merged revisions 73138 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r73138 | mark.dickinson | 2009年06月02日 08:39:26 +0100 (2009年6月02日) | 1 line
 
 Typo in socket.py. Thanks Pablo Torres Navarrete.
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Lib/socket.py
Modified: python/branches/release30-maint/Lib/socket.py
==============================================================================

--- python/branches/release30-maint/Lib/socket.py	(original)
+++ python/branches/release30-maint/Lib/socket.py	Tue Jun 2 09:42:11 2009
@@ -16,7 +16,7 @@
 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
