summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 13:58:13 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 13:58:13 (GMT)
commita7e7497d885b5616fbe9bd4b16778f9e0e50b07d (patch)
tree5e1e28b27364065e3f3f6ea06df67ad5e1228531 /Modules
parente0c69161bc9d4e9deca4fc0add189b4df9cce8cb (diff)
parent85a8629d2134969fc9c35b56509d3a76d9dccecf (diff)
downloadcpython-a7e7497d885b5616fbe9bd4b16778f9e0e50b07d.zip
cpython-a7e7497d885b5616fbe9bd4b16778f9e0e50b07d.tar.gz
cpython-a7e7497d885b5616fbe9bd4b16778f9e0e50b07d.tar.bz2
#18466: merge with 3.3.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c2
-rw-r--r--Modules/_winapi.c2
-rw-r--r--Modules/unicodedata.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index edda908..5021e1a 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1638,7 +1638,7 @@ static PyObject *PySSL_SSLshutdown(PySSLSocket *self)
* Otherwise OpenSSL might read in too much data,
* eating clear text data that happens to be
* transmitted after the SSL shutdown.
- * Should be safe to call repeatedly everytime this
+ * Should be safe to call repeatedly every time this
* function is used and the shutdown_seen_zero != 0
* condition is met.
*/
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index c34d2db..20d0063 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -491,7 +491,7 @@ getenvironment(PyObject* environment)
Py_UCS4 *buffer = NULL, *p, *end;
PyObject *keys, *values, *res;
- /* convert environment dictionary to windows enviroment string */
+ /* convert environment dictionary to windows environment string */
if (! PyMapping_Check(environment)) {
PyErr_SetString(
PyExc_TypeError, "environment must be dictionary or None");
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 27fadb7..d89316a 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -524,7 +524,7 @@ nfd_nfkd(PyObject *self, PyObject *input, int k)
while(stackptr) {
Py_UCS4 code = stack[--stackptr];
/* Hangul Decomposition adds three characters in
- a single step, so we need atleast that much room. */
+ a single step, so we need at least that much room. */
if (space < 3) {
Py_UCS4 *new_output;
osize += 10;