From ad537f23e2e60b92c67fe01855ec1a0a7479df46 Mon Sep 17 00:00:00 2001 From: Tim Golden Date: Sun, 8 Aug 2010 11:18:16 +0000 Subject: Issue #3210: Revert C module changes and apply patch from Hirokazu Yamamoto instead --- PC/_subprocess.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'PC/_subprocess.c') diff --git a/PC/_subprocess.c b/PC/_subprocess.c index 2a3207b87d..5132a5ed00 100644 --- a/PC/_subprocess.c +++ b/PC/_subprocess.c @@ -429,7 +429,6 @@ sp_CreateProcess(PyObject* self, PyObject* args) PyObject* env_mapping; Py_UNICODE* current_directory; PyObject* startup_info; - DWORD error; if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess", &application_name, @@ -479,22 +478,8 @@ sp_CreateProcess(PyObject* self, PyObject* args) Py_XDECREF(environment); - if (! result) { - error = GetLastError(); - if(si.hStdInput != INVALID_HANDLE_VALUE) { - CloseHandle(si.hStdInput); - si.hStdInput = INVALID_HANDLE_VALUE; - } - if(si.hStdOutput != INVALID_HANDLE_VALUE) { - CloseHandle(si.hStdOutput); - si.hStdOutput = INVALID_HANDLE_VALUE; - } - if(si.hStdError != INVALID_HANDLE_VALUE) { - CloseHandle(si.hStdError); - si.hStdError = INVALID_HANDLE_VALUE; - } - return PyErr_SetFromWindowsErr(error); - } + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); return Py_BuildValue("NNii", sp_handle_new(pi.hProcess), -- cgit v1.2.1