diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:38:59 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:38:59 (GMT) |
commit | b88ed1549e76fadf161227d15cc307f0e8b94c59 (patch) | |
tree | 7fea10f9a15064480554f093da39f361df463c61 /Modules/socketmodule.c | |
parent | c8a03349d174379f051ab93d02a2918a15269e00 (diff) | |
parent | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (diff) | |
download | cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.zip cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.gz cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.bz2 |
#11565: Merge with 3.2.
Diffstat (limited to 'Modules/socketmodule.c')
-rw-r--r-- | Modules/socketmodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 3658fa2..617295a 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -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; } @@ -4372,7 +4372,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 } @@ -4406,7 +4406,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. */ |