#18466: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 16:58:13 +03:00
commit a7e7497d88
12 changed files with 12 additions and 12 deletions

View file

@ -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");