merge 3.2

This commit is contained in:
Benjamin Peterson 2011-11-22 23:14:47 -06:00
commit e8eb0e82f3

View file

@ -7844,12 +7844,16 @@ posix_unsetenv(PyObject *self, PyObject *args)
int err; int err;
if (!PyArg_ParseTuple(args, "O&:unsetenv", if (!PyArg_ParseTuple(args, "O&:unsetenv",
PyUnicode_FSConverter, &name)) PyUnicode_FSConverter, &name))
return NULL; return NULL;
err = unsetenv(PyBytes_AS_STRING(name)); err = unsetenv(PyBytes_AS_STRING(name));
if (err) if (err) {
Py_DECREF(name);
return posix_error(); return posix_error();
}
/* Remove the key from posix_putenv_garbage; /* Remove the key from posix_putenv_garbage;
* this will cause it to be collected. This has to * this will cause it to be collected. This has to