summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2010-08-08 11:18:34 (GMT)
committerTim Golden <mail@timgolden.me.uk>2010-08-08 11:18:34 (GMT)
commit10215de1ba09b7608a390aeecbd6cde77c8522f1 (patch)
treefd674af54240a424343bdf99712b313b1b7c2d7b /PC
parent291430821487e7f3512c1ba769e5044b651f8fc3 (diff)
downloadcpython-10215de1ba09b7608a390aeecbd6cde77c8522f1.zip
cpython-10215de1ba09b7608a390aeecbd6cde77c8522f1.tar.gz
cpython-10215de1ba09b7608a390aeecbd6cde77c8522f1.tar.bz2
Issue #3210: Revert C module changes and apply patch from Hirokazu Yamamoto instead
Diffstat (limited to 'PC')
-rw-r--r--PC/_subprocess.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index 635abc8..27d3dc6 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),