mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#11565: Merge with 3.1.

Browse source
This commit is contained in:
Ezio Melotti 2011-03-16 11:35:38 +02:00
commit 3b3499ba69
93 changed files with 124 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/socketmodule.c
View file

@ -2242,7 +2242,7 @@ will allow before refusing new connections.");
* This is the guts of the recv() and recv_into() methods, which reads into a
* char buffer. If you have any inc/dec ref to do to the objects that contain
* the buffer, do it in the caller. This function returns the number of bytes
* succesfully read. If there was an error, it returns -1. Note that it is
* successfully read. If there was an error, it returns -1. Note that it is
* also possible that we return a number of bytes smaller than the request
* bytes.
*/
@ -2446,7 +2446,7 @@ See recv() for documentation about the flags.");
* This is the guts of the recvfrom() and recvfrom_into() methods, which reads
* into a char buffer. If you have any inc/def ref to do to the objects that
* contain the buffer, do it in the caller. This function returns the number
* of bytes succesfully read. If there was an error, it returns -1. Note
* of bytes successfully read. If there was an error, it returns -1. Note
* that it is also possible that we return a number of bytes smaller than the
* request bytes.
*
@ -2541,9 +2541,9 @@ sock_recvfrom(PySocketSockObject *s, PyObject *args)
if (outlen != recvlen) {
/* We did not read as many bytes as we anticipated, resize the
string if possible and be succesful. */
string if possible and be successful. */
if (_PyBytes_Resize(&buf, outlen) < 0)
/* Oopsy, not so succesful after all. */
/* Oopsy, not so successful after all. */
goto finally;
}
@ -4337,7 +4337,7 @@ os_init(void)
return 0; /* Failure */
#else
/* No need to initialise sockets with GCC/EMX */
/* No need to initialize sockets with GCC/EMX */
return 1; /* Success */
#endif
}
@ -4371,7 +4371,7 @@ PySocketModule_APIObject PySocketModuleAPI =
"socket.py" which implements some additional functionality.
The import of "_socket" may fail with an ImportError exception if
os-specific initialization fails. On Windows, this does WINSOCK
initialization. When WINSOCK is initialized succesfully, a call to
initialization. When WINSOCK is initialized successfully, a call to
WSACleanup() is scheduled to be made at exit time.
*/