diff options
| author | Tim Golden <mail@timgolden.me.uk> | 2010-08-08 11:17:56 (GMT) |
|---|---|---|
| committer | Tim Golden <mail@timgolden.me.uk> | 2010-08-08 11:17:56 (GMT) |
| commit | 431774f32a22a4bdfc5a239709bcba3e8d7045e9 (patch) | |
| tree | 61a4094611d7d1e24eb726dded348368c3b81c95 /PC | |
| parent | 3de8a305004f465d8c8967862a1a6251cb2ff375 (diff) | |
| download | cpython-431774f32a22a4bdfc5a239709bcba3e8d7045e9.zip cpython-431774f32a22a4bdfc5a239709bcba3e8d7045e9.tar.gz cpython-431774f32a22a4bdfc5a239709bcba3e8d7045e9.tar.bz2 | |
Issue #3210: Revert C module changes and apply patch from Hirokazu Yamamoto instead
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/_subprocess.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/PC/_subprocess.c b/PC/_subprocess.c index 41a2498..6780382 100644 --- a/PC/_subprocess.c +++ b/PC/_subprocess.c @@ -425,7 +425,6 @@ sp_CreateProcess(PyObject* self, PyObject* args) PyObject* env_mapping; char* current_directory; PyObject* startup_info; - DWORD error; if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess", &application_name, @@ -475,22 +474,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), |