diff options
| -rw-r--r-- | Lib/popen2.py | 35 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 60 |
2 files changed, 55 insertions, 40 deletions
diff --git a/Lib/popen2.py b/Lib/popen2.py index 73ff77c..c4d3e4c 100644 --- a/Lib/popen2.py +++ b/Lib/popen2.py @@ -89,9 +89,14 @@ class Popen3: _active.remove(self) return self.sts -try: - from os import popen2 -except NameError: +if hasattr(os, "popen2"): + def popen2(cmd, mode='t', bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is + specified, it sets the buffer size for the I/O pipes. The file objects + (child_stdout, child_stdin) are returned.""" + w, r = os.popen2(cmd, mode, bufsize) + return r, w +else: def popen2(cmd, mode='t', bufsize=-1): """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is specified, it sets the buffer size for the I/O pipes. The file objects @@ -104,9 +109,14 @@ except NameError: inst = Popen3(cmd, 0, bufsize) return inst.fromchild, inst.tochild -try: - from os import popen3 -except NameError: +if hasattr(os, "popen3"): + def popen3(cmd, mode='t', bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is + specified, it sets the buffer size for the I/O pipes. The file objects + (child_stdout, child_stdin, child_stderr) are returned.""" + w, r, e = os.popen3(cmd, mode, bufsize) + return r, w, e +else: def popen3(cmd, mode='t', bufsize=-1): """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is specified, it sets the buffer size for the I/O pipes. The file objects @@ -119,10 +129,15 @@ except NameError: inst = Popen3(cmd, 1, bufsize) return inst.fromchild, inst.tochild, inst.childerr -try: - from os import popen4 -except NameError: - pass # not on unix +if hasattr(os, "popen4"): + def popen4(cmd, mode='t', bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is + specified, it sets the buffer size for the I/O pipes. The file objects + (child_stdout_stderr, child_stdin) are returned.""" + w, r = os.popen4(cmd, mode, bufsize) + return r, w +else: + pass # not yet on unix def _test(): teststr = "abc\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 8ea404e..2cfd39d 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2295,9 +2295,9 @@ win32_popen4(PyObject *self, PyObject *args) static int _PyPopenCreateProcess(char *cmdstring, - HANDLE hStdin, - HANDLE hStdout, - HANDLE hStderr) + HANDLE hStdin, + HANDLE hStdout, + HANDLE hStderr) { PROCESS_INFORMATION piProcInfo; STARTUPINFO siStartInfo; @@ -2360,15 +2360,15 @@ _PyPopenCreateProcess(char *cmdstring, siStartInfo.wShowWindow = SW_HIDE; if (CreateProcess(NULL, - s2, - NULL, - NULL, - TRUE, - CREATE_NEW_CONSOLE, - NULL, - NULL, - &siStartInfo, - &piProcInfo) ) { + s2, + NULL, + NULL, + TRUE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &siStartInfo, + &piProcInfo) ) { /* Close the handles now so anyone waiting is woken. */ CloseHandle(piProcInfo.hProcess); CloseHandle(piProcInfo.hThread); @@ -2404,9 +2404,9 @@ _PyPopen(char *cmdstring, int mode, int n) * the these handles; resulting in non-closeable handles to the pipes * being created. */ fSuccess = DuplicateHandle(GetCurrentProcess(), hChildStdinWr, - GetCurrentProcess(), &hChildStdinWrDup, 0, - FALSE, - DUPLICATE_SAME_ACCESS); + GetCurrentProcess(), &hChildStdinWrDup, 0, + FALSE, + DUPLICATE_SAME_ACCESS); if (!fSuccess) return win32_error("DuplicateHandle", NULL); @@ -2418,9 +2418,8 @@ _PyPopen(char *cmdstring, int mode, int n) return win32_error("CreatePipe", NULL); fSuccess = DuplicateHandle(GetCurrentProcess(), hChildStdoutRd, - GetCurrentProcess(), &hChildStdoutRdDup, 0, - FALSE, - DUPLICATE_SAME_ACCESS); + GetCurrentProcess(), &hChildStdoutRdDup, 0, + FALSE, DUPLICATE_SAME_ACCESS); if (!fSuccess) return win32_error("DuplicateHandle", NULL); @@ -2431,10 +2430,11 @@ _PyPopen(char *cmdstring, int mode, int n) if (n != POPEN_4) { if (!CreatePipe(&hChildStderrRd, &hChildStderrWr, &saAttr, 0)) return win32_error("CreatePipe", NULL); - fSuccess = DuplicateHandle(GetCurrentProcess(), hChildStderrRd, - GetCurrentProcess(), &hChildStderrRdDup, 0, - FALSE, - DUPLICATE_SAME_ACCESS); + fSuccess = DuplicateHandle(GetCurrentProcess(), + hChildStderrRd, + GetCurrentProcess(), + &hChildStderrRdDup, 0, + FALSE, DUPLICATE_SAME_ACCESS); if (!fSuccess) return win32_error("DuplicateHandle", NULL); /* Close the inheritable version of ChildStdErr that we're using. */ @@ -2516,7 +2516,7 @@ _PyPopen(char *cmdstring, int mode, int n) if (n != 4) CloseHandle(hChildStderrRdDup); - f = Py_BuildValue("OO",p2,p1); + f = Py_BuildValue("OO",p1,p2); break; } @@ -2545,23 +2545,23 @@ _PyPopen(char *cmdstring, int mode, int n) PyFile_SetBufSize(p1, 0); PyFile_SetBufSize(p2, 0); PyFile_SetBufSize(p3, 0); - f = Py_BuildValue("OOO",p2,p1,p3); + f = Py_BuildValue("OOO",p1,p2,p3); break; } } if (n == POPEN_4) { if (!_PyPopenCreateProcess(cmdstring, - hChildStdinRd, - hChildStdoutWr, - hChildStdoutWr)) + hChildStdinRd, + hChildStdoutWr, + hChildStdoutWr)) return win32_error("CreateProcess", NULL); } else { if (!_PyPopenCreateProcess(cmdstring, - hChildStdinRd, - hChildStdoutWr, - hChildStderrWr)) + hChildStdinRd, + hChildStdoutWr, + hChildStderrWr)) return win32_error("CreateProcess", NULL); } |