Merge with 3.2

This commit is contained in:
Ross Lagerwall 2012-08-24 13:32:14 +02:00
commit a4b070102a
2 changed files with 5 additions and 1 deletions

View File

@ -29,6 +29,8 @@ Core and Builtins
Library
-------
- Issue #15777: Fix a refleak in _posixsubprocess.
- Issue ##665194: Update email.utils.localtime to use datetime.astimezone and
correctly handle historic changes in UTC offsets.

View File

@ -568,8 +568,10 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
}
exec_array = _PySequence_BytesToCharpArray(executable_list);
if (!exec_array)
if (!exec_array) {
Py_XDECREF(gc_module);
return NULL;
}
/* Convert args and env into appropriate arguments for exec() */
/* These conversions are done in the parent process to avoid allocating