summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/subprocess.py27
-rw-r--r--PC/_subprocess.c19
2 files changed, 15 insertions, 31 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index f8a6342..ae033d4 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -886,6 +886,19 @@ class Popen(object):
# translate errno using _sys_errlist (or simliar), but
# how can this be done from Python?
raise WindowsError(*e.args)
+ finally:
+ # Child is launched. Close the parent's copy of those pipe
+ # handles that only the child should have open. You need
+ # to make sure that no handles to the write end of the
+ # output pipe are maintained in this process or else the
+ # pipe will not close when the child process exits and the
+ # ReadFile will hang.
+ if p2cread != -1:
+ p2cread.Close()
+ if c2pwrite != -1:
+ c2pwrite.Close()
+ if errwrite != -1:
+ errwrite.Close()
# Retain the process handle, but close the thread handle
self._child_created = True
@@ -893,20 +906,6 @@ class Popen(object):
self.pid = pid
ht.Close()
- # Child is launched. Close the parent's copy of those pipe
- # handles that only the child should have open. You need
- # to make sure that no handles to the write end of the
- # output pipe are maintained in this process or else the
- # pipe will not close when the child process exits and the
- # ReadFile will hang.
- if p2cread != -1:
- p2cread.Close()
- if c2pwrite != -1:
- c2pwrite.Close()
- if errwrite != -1:
- errwrite.Close()
-
-
def _internal_poll(self, _deadstate=None,
_WaitForSingleObject=_subprocess.WaitForSingleObject,
_WAIT_OBJECT_0=_subprocess.WAIT_OBJECT_0,
diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index 2a3207b..5132a5e 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),