Mailman 3 October 2004 - Python-checkins

python/dist/src/Lib pdb.py, 1.70, 1.71 subprocess.py, 1.2, 1.3
by tim_one＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15813/Lib Modified Files: pdb.py subprocess.py Log Message: Whitespace normalization. Index: pdb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pdb.py,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- pdb.py 12 Oct 2004 18:12:09 -0000 1.70 +++ pdb.py 12 Oct 2004 21:51:32 -0000 1.71 @@ -946,7 +946,7 @@ into an absolute file name. """ if os.path.isabs(filename) and os.path.exists(filename): - return filename + return filename f = os.path.join(sys.path[0], filename) if os.path.exists(f) and self.canonic(f) == self.mainpyfile: return f @@ -967,8 +967,8 @@ # Start with fresh empty copy of globals and locals and tell the script # that it's being run as __main__ to avoid scripts being able to access # the pdb.py namespace. - globals_ = {"__name__" : "__main__"} - locals_ = globals_ + globals_ = {"__name__" : "__main__"} + locals_ = globals_ # When bdb sets tracing, a number of call and line events happens # BEFORE debugger even reaches user's code (and the exact sequence of @@ -1057,7 +1057,7 @@ pdb._runscript(mainpyfile) if pdb._user_requested_quit: break - print "The program finished and will be restarted" + print "The program finished and will be restarted" except SystemExit: # In most cases SystemExit does not warrant a post-mortem session. print "The program exited via sys.exit(). Exit status: ", @@ -1076,4 +1076,3 @@ # When invoked as main program, invoke the debugger on a script if __name__=='__main__': main() - Index: subprocess.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/subprocess.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- subprocess.py 12 Oct 2004 16:38:42 -0000 1.2 +++ subprocess.py 12 Oct 2004 21:51:32 -0000 1.3 @@ -1,6 +1,6 @@ # subprocess - Subprocesses with accessible I/O streams # -# For more information about this module, see PEP 324. +# For more information about this module, see PEP 324. # # Copyright (c) 2003-2004 by Peter Astrand <astrand(a)lysator.liu.se> # @@ -174,7 +174,7 @@ terminate. The optional stdin argument should be a string to be sent to the child process, or None, if no data should be sent to the child. - + communicate() returns a tuple (stdout, stderr). Note: The data read is buffered in memory, so do not use this @@ -262,7 +262,7 @@ Replacing os.spawn* ------------------- -P_NOWAIT example: +P_NOWAIT example: pid = os.spawnlp(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg") ==> @@ -276,21 +276,21 @@ retcode = call(["/bin/mycmd", "myarg"]) -Vector example: +Vector example: os.spawnvp(os.P_NOWAIT, path, args) ==> Popen([path] + args[1:]) -Environment example: +Environment example: os.spawnlpe(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg", env) ==> Popen(["/bin/mycmd", "myarg"], env={"PATH": "/usr/bin"}) -Replacing os.popen* +Replacing os.popen* ------------------- pipe = os.popen(cmd, mode='r', bufsize) ==> @@ -352,7 +352,7 @@ * the capturestderr argument is replaced with the stderr argument. * stdin=PIPE and stdout=PIPE must be specified. * popen2 closes all filedescriptors by default, but you have to specify - close_fds=True with subprocess.Popen. + close_fds=True with subprocess.Popen. """ @@ -468,10 +468,10 @@ for c in arg: if c == '\\': - # Don't know if we need to double yet. + # Don't know if we need to double yet. bs_buf.append(c) elif c == '"': - # Double backspaces. + # Double backspaces. result.append('\\' * len(bs_buf)*2) bs_buf = [] result.append('\\"') @@ -482,7 +482,7 @@ bs_buf = [] result.append(c) - # Add remaining backspaces, if any. + # Add remaining backspaces, if any. if bs_buf: result.extend(bs_buf) @@ -513,7 +513,7 @@ if creationflags != 0: raise ValueError("creationflags is only supported on Windows platforms") - self.stdin = None + self.stdin = None self.stdout = None self.stderr = None self.pid = None @@ -534,7 +534,7 @@ # are file descriptors on both platforms. The parent objects # are None when not using PIPEs. The child objects are None # when not redirecting. - + (p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite) = self._get_handles(stdin, stdout, stderr) @@ -558,7 +558,7 @@ self.stderr = os.fdopen(errread, 'rU', bufsize) else: self.stderr = os.fdopen(errread, 'rb', bufsize) - + _active.append(self) @@ -578,7 +578,7 @@ """ if stdin == None and stdout == None and stderr == None: return (None, None, None, None, None, None) - + p2cread, p2cwrite = None, None c2pread, c2pwrite = None, None errread, errwrite = None, None @@ -651,7 +651,7 @@ "for Popen to work with your shell or platform.") return w9xpopen - + def _execute_child(self, args, executable, preexec_fn, close_fds, cwd, env, universal_newlines, startupinfo, creationflags, shell, @@ -685,7 +685,7 @@ if startupinfo == None: startupinfo = STARTUPINFO() if not None in (p2cread, c2pwrite, errwrite): - startupinfo.dwFlags |= STARTF_USESTDHANDLES + startupinfo.dwFlags |= STARTF_USESTDHANDLES startupinfo.hStdInput = p2cread startupinfo.hStdOutput = c2pwrite startupinfo.hStdError = errwrite @@ -724,7 +724,7 @@ if errwrite != None: errwrite.Close() - + def poll(self): """Check if child process has terminated. Returns returncode attribute.""" @@ -830,7 +830,7 @@ c2pwrite = stdout else: # Assuming file-like object - c2pwrite = stdout.fileno() + c2pwrite = stdout.fileno() if stderr == None: pass @@ -867,8 +867,8 @@ os.close(i) except: pass - - + + def _execute_child(self, args, executable, preexec_fn, close_fds, cwd, env, universal_newlines, startupinfo, creationflags, shell, @@ -976,7 +976,7 @@ _active.remove(self) - + def poll(self): """Check if child process has terminated. Returns returncode attribute.""" @@ -1022,7 +1022,7 @@ self.stdin.close() if self.stdout: read_set.append(self.stdout) - stdout = [] + stdout = [] if self.stderr: read_set.append(self.stderr) stderr = [] @@ -1137,5 +1137,3 @@ _demo_windows() else: _demo_posix() - -

1 0

python/dist/src/Lib/test test_subprocess.py, 1.1, 1.2
by tim_one＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15813/Lib/test Modified Files: test_subprocess.py Log Message: Whitespace normalization. Index: test_subprocess.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_subprocess.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test_subprocess.py 12 Oct 2004 15:26:28 -0000 1.1 +++ test_subprocess.py 12 Oct 2004 21:51:32 -0000 1.2 @@ -26,7 +26,7 @@ else: fname = tempfile.mktemp() return os.open(fname, os.O_RDWR|os.O_CREAT), fname - + # # Generic tests # @@ -85,7 +85,7 @@ def test_stdin_filedes(self): """stdin is set to open file descriptor""" - tf = tempfile.TemporaryFile() + tf = tempfile.TemporaryFile() d = tf.fileno() os.write(d, "pear") os.lseek(d, 0, 0) @@ -115,7 +115,7 @@ def test_stdout_filedes(self): """stdout is set to open file descriptor""" - tf = tempfile.TemporaryFile() + tf = tempfile.TemporaryFile() d = tf.fileno() p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stdout.write("orange")'], @@ -126,7 +126,7 @@ def test_stdout_fileobj(self): """stdout is set to open file object""" - tf = tempfile.TemporaryFile() + tf = tempfile.TemporaryFile() p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stdout.write("orange")'], stdout=tf) @@ -143,7 +143,7 @@ def test_stderr_filedes(self): """stderr is set to open file descriptor""" - tf = tempfile.TemporaryFile() + tf = tempfile.TemporaryFile() d = tf.fileno() p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stderr.write("strawberry")'], @@ -154,7 +154,7 @@ def test_stderr_fileobj(self): """stderr is set to open file object""" - tf = tempfile.TemporaryFile() + tf = tempfile.TemporaryFile() p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stderr.write("strawberry")'], stderr=tf) @@ -230,7 +230,7 @@ def test_communicate_pipe_buf(self): """communicate() with writes larger than pipe_buf""" # This test will probably deadlock rather than fail, if - # communicate() does not work properly. + # communicate() does not work properly. x, y = os.pipe() if mswindows: pipe_buf = 512 @@ -239,7 +239,7 @@ os.close(x) os.close(y) p = subprocess.Popen([sys.executable, "-c", - 'import sys,os;' + 'import sys,os;' 'sys.stdout.write(sys.stdin.read(47));' \ 'sys.stderr.write("xyz"*%d);' \ 'sys.stdout.write(sys.stdin.read())' % pipe_buf], @@ -258,7 +258,7 @@ (stdout, stderr) = p.communicate("split") self.assertEqual(stdout, "bananasplit") self.assertEqual(stderr, "") - + def test_universal_newlines(self): """universal newlines""" p = subprocess.Popen([sys.executable, "-c", @@ -354,7 +354,7 @@ self.assertEqual(p.wait(), 0) # Subsequent invocations should just return the returncode self.assertEqual(p.wait(), 0) - + # # POSIX tests # @@ -370,7 +370,7 @@ self.assertNotEqual(e.child_traceback.find("os.chdir"), -1) else: self.fail("Expected OSError") - + def test_run_abort(self): """returncode handles signal termination""" p = subprocess.Popen([sys.executable, "-c", "import os; os.abort()"]) @@ -394,7 +394,7 @@ 'import sys,os;' \ 'sys.stdout.write(str(os.dup(0)))'], stdout=subprocess.PIPE, close_fds=1) - # When all fds are closed, the next free fd should be 3. + # When all fds are closed, the next free fd should be 3. self.assertEqual(p.stdout.read(), "3") def test_args_string(self): @@ -446,7 +446,7 @@ rc = subprocess.call(fname) self.assertEqual(rc, 47) - + # # Windows tests # @@ -454,7 +454,7 @@ def test_startupinfo(self): """startupinfo argument""" # We uses hardcoded constants, because we do not want to - # depend on win32all. + # depend on win32all. STARTF_USESHOWWINDOW = 1 SW_MAXIMIZE = 3 startupinfo = subprocess.STARTUPINFO() @@ -486,7 +486,7 @@ newenv = os.environ.copy() newenv["FRUIT"] = "physalis" p = subprocess.Popen(["set"], shell=1, - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, env=newenv) self.assertNotEqual(p.stdout.read().find("physalis"), -1) @@ -495,7 +495,7 @@ newenv = os.environ.copy() newenv["FRUIT"] = "physalis" p = subprocess.Popen("set", shell=1, - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, env=newenv) self.assertNotEqual(p.stdout.read().find("physalis"), -1) @@ -511,4 +511,3 @@ if __name__ == "__main__": test_main() -

1 0

python/dist/src/PCbuild pythoncore.vcproj, 1.20, 1.21
by tim_one＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15106/PCbuild Modified Files: pythoncore.vcproj Log Message: Supply the _subprocess module under 7.1. I'm not sure what the status of this should be on non-WIN32 Windows variants. Index: pythoncore.vcproj =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.vcproj,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- pythoncore.vcproj 1 Sep 2004 18:29:25 -0000 1.20 +++ pythoncore.vcproj 12 Oct 2004 21:48:57 -0000 1.21 @@ -364,6 +364,9 @@ RelativePath="..\Modules\_sre.c"> </File> <File + RelativePath="..\Pc\_subprocess.c"> + </File> + <File RelativePath="..\Modules\_weakref.c"> <FileConfiguration Name="Release|Win32">

1 0

python/dist/src/PC config.c,1.50,1.51
by tim_one＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15106/PC Modified Files: config.c Log Message: Supply the _subprocess module under 7.1. I'm not sure what the status of this should be on non-WIN32 Windows variants. Index: config.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/config.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- config.c 31 Aug 2004 14:29:12 -0000 1.50 +++ config.c 12 Oct 2004 21:48:56 -0000 1.51 @@ -61,6 +61,7 @@ extern void init_codecs_jp(void); extern void init_codecs_kr(void); extern void init_codecs_tw(void); +extern void init_subprocess(void); /* tools/freeze/makeconfig.py marker for additional "extern" */ /* -- ADDMODULE MARKER 1 -- */ @@ -105,6 +106,8 @@ {"msvcrt", initmsvcrt}, {"_locale", init_locale}, #endif + /* XXX Should _subprocess go in a WIN32 block? not WIN64? */ + {"_subprocess", init_subprocess}, {"_codecs", init_codecs}, {"_weakref", init_weakref},

1 0

python/dist/src/PC _subprocess.c,1.1,1.2
by tim_one＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11905/pc Modified Files: _subprocess.c Log Message: Before this turns into an unreadable mess, follow PEP 7 by using hard tab indents in C code. Index: _subprocess.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/_subprocess.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- _subprocess.c 12 Oct 2004 15:26:28 -0000 1.1 +++ _subprocess.c 12 Oct 2004 21:38:22 -0000 1.2 @@ -3,16 +3,16 @@ * * Currently, this extension module is only required when using the * subprocess module on Windows, but in the future, stubs for other - * platforms might be added here as well. + * platforms might be added here as well. * * Copyright (c) 2004 by Fredrik Lundh <fredrik(a)pythonware.com> * Copyright (c) 2004 by Secret Labs AB, http://www.pythonware.com * Copyright (c) 2004 by Peter Astrand <astrand(a)lysator.liu.se> - * + * * By obtaining, using, and/or copying this software and/or its * associated documentation, you agree that you have read, understood, * and will comply with the following terms and conditions: - * + * * Permission to use, copy, modify, and distribute this software and * its associated documentation for any purpose and without fee is * hereby granted, provided that the above copyright notice appears in @@ -21,7 +21,7 @@ * authors not be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. - * + * * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -29,7 +29,7 @@ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * + * */ /* TODO: handle unicode command lines? */ @@ -46,8 +46,8 @@ the wrapper is used to provide Detach and Close methods */ typedef struct { - PyObject_HEAD - HANDLE handle; + PyObject_HEAD + HANDLE handle; } sp_handle_object; staticforward PyTypeObject sp_handle_type; @@ -55,89 +55,89 @@ static PyObject* sp_handle_new(HANDLE handle) { - sp_handle_object* self; + sp_handle_object* self; - self = PyObject_NEW(sp_handle_object, &sp_handle_type); - if (self == NULL) - return NULL; + self = PyObject_NEW(sp_handle_object, &sp_handle_type); + if (self == NULL) + return NULL; - self->handle = handle; + self->handle = handle; - return (PyObject*) self; + return (PyObject*) self; } static PyObject* sp_handle_detach(sp_handle_object* self, PyObject* args) { - HANDLE handle; + HANDLE handle; - if (!PyArg_ParseTuple(args, ":Detach")) - return NULL; + if (! PyArg_ParseTuple(args, ":Detach")) + return NULL; - handle = self->handle; + handle = self->handle; - self->handle = NULL; + self->handle = NULL; - /* note: return the current handle, as an integer */ - return PyInt_FromLong((long) handle); + /* note: return the current handle, as an integer */ + return PyInt_FromLong((long) handle); } static PyObject* sp_handle_close(sp_handle_object* self, PyObject* args) { - if (!PyArg_ParseTuple(args, ":Close")) - return NULL; + if (! PyArg_ParseTuple(args, ":Close")) + return NULL; - if (self->handle != INVALID_HANDLE_VALUE) { - CloseHandle(self->handle); - self->handle = INVALID_HANDLE_VALUE; - } - Py_INCREF(Py_None); - return Py_None; + if (self->handle != INVALID_HANDLE_VALUE) { + CloseHandle(self->handle); + self->handle = INVALID_HANDLE_VALUE; + } + Py_INCREF(Py_None); + return Py_None; } static void sp_handle_dealloc(sp_handle_object* self) { - if (self->handle != INVALID_HANDLE_VALUE) - CloseHandle(self->handle); - PyMem_DEL(self); + if (self->handle != INVALID_HANDLE_VALUE) + CloseHandle(self->handle); + PyMem_DEL(self); } static PyMethodDef sp_handle_methods[] = { - {"Detach", (PyCFunction) sp_handle_detach, 1}, - {"Close", (PyCFunction) sp_handle_close, 1}, - {NULL, NULL} + {"Detach", (PyCFunction) sp_handle_detach, 1}, + {"Close", (PyCFunction) sp_handle_close, 1}, + {NULL, NULL} }; -static PyObject* +static PyObject* sp_handle_getattr(sp_handle_object* self, char* name) { - return Py_FindMethod(sp_handle_methods, (PyObject*) self, name); + return Py_FindMethod(sp_handle_methods, (PyObject*) self, name); } static PyObject* sp_handle_as_int(sp_handle_object* self) { - return PyInt_FromLong((long) self->handle); + return PyInt_FromLong((long) self->handle); } static PyNumberMethods sp_handle_as_number; statichere PyTypeObject sp_handle_type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "_subprocess_handle", sizeof(sp_handle_object), 0, - (destructor) sp_handle_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - (getattrfunc) sp_handle_getattr, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - &sp_handle_as_number, /*tp_as_number */ - 0, /*tp_as_sequence */ - 0, /*tp_as_mapping */ - 0 /*tp_hash*/ + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "_subprocess_handle", sizeof(sp_handle_object), 0, + (destructor) sp_handle_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + (getattrfunc) sp_handle_getattr,/*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + &sp_handle_as_number, /*tp_as_number */ + 0, /*tp_as_sequence */ + 0, /*tp_as_mapping */ + 0 /*tp_hash*/ }; /* -------------------------------------------------------------------- */ @@ -146,91 +146,99 @@ static PyObject * sp_GetStdHandle(PyObject* self, PyObject* args) { - HANDLE handle; + HANDLE handle; + int std_handle; - int std_handle; - if (!PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle)) - return NULL; + if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle)) + return NULL; - Py_BEGIN_ALLOW_THREADS - handle = GetStdHandle((DWORD) std_handle); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + handle = GetStdHandle((DWORD) std_handle); + Py_END_ALLOW_THREADS - if (handle == INVALID_HANDLE_VALUE) - return PyErr_SetFromWindowsErr(GetLastError()); + if (handle == INVALID_HANDLE_VALUE) + return PyErr_SetFromWindowsErr(GetLastError()); - if (!handle) { - Py_INCREF(Py_None); - return Py_None; - } + if (! handle) { + Py_INCREF(Py_None); + return Py_None; + } - /* note: returns integer, not handle object */ - return PyInt_FromLong((long) handle); + /* note: returns integer, not handle object */ + return PyInt_FromLong((long) handle); } static PyObject * sp_GetCurrentProcess(PyObject* self, PyObject* args) { - if (!PyArg_ParseTuple(args, ":GetCurrentProcess")) - return NULL; + if (! PyArg_ParseTuple(args, ":GetCurrentProcess")) + return NULL; - return sp_handle_new(GetCurrentProcess()); + return sp_handle_new(GetCurrentProcess()); } static PyObject * sp_DuplicateHandle(PyObject* self, PyObject* args) { - HANDLE target_handle; - BOOL result; + HANDLE target_handle; + BOOL result; - long source_process_handle; - long source_handle; - long target_process_handle; - int desired_access; - int inherit_handle; - int options = 0; - if (!PyArg_ParseTuple(args, "lllii|i:DuplicateHandle", - &source_process_handle, &source_handle, - &target_process_handle, - &desired_access, &inherit_handle, &options)) - return NULL; + long source_process_handle; + long source_handle; + long target_process_handle; + int desired_access; + int inherit_handle; + int options = 0; - Py_BEGIN_ALLOW_THREADS - result = DuplicateHandle( - (HANDLE) source_process_handle, (HANDLE) source_handle, - (HANDLE) target_process_handle, &target_handle, desired_access, - inherit_handle, options - ); - Py_END_ALLOW_THREADS + if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle", + &source_process_handle, + &source_handle, + &target_process_handle, + &desired_access, + &inherit_handle, + &options)) + return NULL; - if (!result) - return PyErr_SetFromWindowsErr(GetLastError()); + Py_BEGIN_ALLOW_THREADS + result = DuplicateHandle( + (HANDLE) source_process_handle, + (HANDLE) source_handle, + (HANDLE) target_process_handle, + &target_handle, + desired_access, + inherit_handle, + options + ); + Py_END_ALLOW_THREADS - return sp_handle_new(target_handle); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); + + return sp_handle_new(target_handle); } static PyObject * sp_CreatePipe(PyObject* self, PyObject* args) { - HANDLE read_pipe; - HANDLE write_pipe; - BOOL result; + HANDLE read_pipe; + HANDLE write_pipe; + BOOL result; - PyObject* pipe_attributes; /* ignored */ - int size; - if (!PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size)) - return NULL; + PyObject* pipe_attributes; /* ignored */ + int size; - Py_BEGIN_ALLOW_THREADS - result = CreatePipe(&read_pipe, &write_pipe, NULL, size); - Py_END_ALLOW_THREADS + if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size)) + return NULL; - if (!result) - return PyErr_SetFromWindowsErr(GetLastError()); + Py_BEGIN_ALLOW_THREADS + result = CreatePipe(&read_pipe, &write_pipe, NULL, size); + Py_END_ALLOW_THREADS - return Py_BuildValue( - "NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe) - ); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); + + return Py_BuildValue( + "NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe)); } /* helpers for createprocess */ @@ -238,236 +246,253 @@ static int getint(PyObject* obj, char* name) { - PyObject* value; - value = PyObject_GetAttrString(obj, name); - if (!value) { - PyErr_Clear(); /* FIXME: propagate error? */ - return 0; - } - return (int) PyInt_AsLong(value); + PyObject* value; + + value = PyObject_GetAttrString(obj, name); + if (! value) { + PyErr_Clear(); /* FIXME: propagate error? */ + return 0; + } + return (int) PyInt_AsLong(value); } - + static HANDLE gethandle(PyObject* obj, char* name) { - sp_handle_object* value; - value = (sp_handle_object*) PyObject_GetAttrString(obj, name); - if (!value) { - PyErr_Clear(); /* FIXME: propagate error? */ - return NULL; - } - if (value->ob_type != &sp_handle_type) - return NULL; - return value->handle; + sp_handle_object* value; + + value = (sp_handle_object*) PyObject_GetAttrString(obj, name); + if (! value) { + PyErr_Clear(); /* FIXME: propagate error? */ + return NULL; + } + if (value->ob_type != &sp_handle_type) + return NULL; + return value->handle; } static PyObject* getenvironment(PyObject* environment) { - int i, envsize; - PyObject* out = NULL; - PyObject* keys; - PyObject* values; - char* p; + int i, envsize; + PyObject* out = NULL; + PyObject* keys; + PyObject* values; + char* p; - /* convert environment dictionary to windows enviroment string */ + /* convert environment dictionary to windows enviroment string */ + if (! PyMapping_Check(environment)) { + PyErr_SetString( + PyExc_TypeError, "environment must be dictionary or None"); + return NULL; + } - if (!PyMapping_Check(environment)) { - PyErr_SetString( - PyExc_TypeError, "environment must be dictionary or None" - ); - return NULL; - } - - envsize = PyMapping_Length(environment); + envsize = PyMapping_Length(environment); - keys = PyMapping_Keys(environment); - values = PyMapping_Values(environment); - if (!keys || !values) - goto error; + keys = PyMapping_Keys(environment); + values = PyMapping_Values(environment); + if (!keys || !values) + goto error; - out = PyString_FromStringAndSize(NULL, 2048); - if (!out) - goto error; + out = PyString_FromStringAndSize(NULL, 2048); + if (! out) + goto error; - p = PyString_AS_STRING(out); + p = PyString_AS_STRING(out); - for (i = 0; i < envsize; i++) { - int ksize, vsize, totalsize; - PyObject* key = PyList_GET_ITEM(keys, i); - PyObject* value = PyList_GET_ITEM(values, i); - if (!PyString_Check(key) || !PyString_Check(value)) { - PyErr_SetString( - PyExc_TypeError, "environment can only contain strings" - ); - goto error; - } - ksize = PyString_GET_SIZE(key); - vsize = PyString_GET_SIZE(value); - totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 + vsize + 1 + 1; - if (totalsize > PyString_GET_SIZE(out)) { - int offset = p - PyString_AS_STRING(out); - _PyString_Resize(&out, totalsize + 1024); - p = PyString_AS_STRING(out) + offset; - } - memcpy(p, PyString_AS_STRING(key), ksize); p += ksize; *p++ = '='; - memcpy(p, PyString_AS_STRING(value), vsize); p += vsize; *p++ = '\0'; - } + for (i = 0; i < envsize; i++) { + int ksize, vsize, totalsize; + PyObject* key = PyList_GET_ITEM(keys, i); + PyObject* value = PyList_GET_ITEM(values, i); - /* add trailing null byte */ - *p++ = '\0'; + if (! PyString_Check(key) || ! PyString_Check(value)) { + PyErr_SetString(PyExc_TypeError, + "environment can only contain strings"); + goto error; + } + ksize = PyString_GET_SIZE(key); + vsize = PyString_GET_SIZE(value); + totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 + + vsize + 1 + 1; + if (totalsize > PyString_GET_SIZE(out)) { + int offset = p - PyString_AS_STRING(out); + _PyString_Resize(&out, totalsize + 1024); + p = PyString_AS_STRING(out) + offset; + } + memcpy(p, PyString_AS_STRING(key), ksize); + p += ksize; + *p++ = '='; + memcpy(p, PyString_AS_STRING(value), vsize); + p += vsize; + *p++ = '\0'; + } - _PyString_Resize(&out, p - PyString_AS_STRING(out)); + /* add trailing null byte */ + *p++ = '\0'; + _PyString_Resize(&out, p - PyString_AS_STRING(out)); - /* PyObject_Print(out, stdout, 0); */ + /* PyObject_Print(out, stdout, 0); */ - return out; + return out; -error: - Py_XDECREF(out); - Py_XDECREF(keys); - Py_XDECREF(values); - return NULL; + error: + Py_XDECREF(out); + Py_XDECREF(keys); + Py_XDECREF(values); + return NULL; } static PyObject * sp_CreateProcess(PyObject* self, PyObject* args) { - BOOL result; - PROCESS_INFORMATION pi; - STARTUPINFO si; - PyObject* environment; + BOOL result; + PROCESS_INFORMATION pi; + STARTUPINFO si; + PyObject* environment; - char* application_name; - char* command_line; - PyObject* process_attributes; /* ignored */ - PyObject* thread_attributes; /* ignored */ - int inherit_handles; - int creation_flags; - PyObject* env_mapping; - char* current_directory; - PyObject* startup_info; - if (!PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess", - &application_name, &command_line, - &process_attributes, &thread_attributes, - &inherit_handles, &creation_flags, - &env_mapping, &current_directory, &startup_info)) - return NULL; + char* application_name; + char* command_line; + PyObject* process_attributes; /* ignored */ + PyObject* thread_attributes; /* ignored */ + int inherit_handles; + int creation_flags; + PyObject* env_mapping; + char* current_directory; + PyObject* startup_info; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); + if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess", + &application_name, + &command_line, + &process_attributes, + &thread_attributes, + &inherit_handles, + &creation_flags, + &env_mapping, + &current_directory, + &startup_info)) + return NULL; - /* note: we only support a small subset of all SI attributes */ - si.dwFlags = getint(startup_info, "dwFlags"); - si.hStdInput = gethandle(startup_info, "hStdInput"); - si.hStdOutput = gethandle(startup_info, "hStdOutput"); - si.hStdError = gethandle(startup_info, "hStdError"); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); - if (env_mapping == Py_None) - environment = NULL; - else { - environment = getenvironment(env_mapping); - if (!environment) - return NULL; - } + /* note: we only support a small subset of all SI attributes */ + si.dwFlags = getint(startup_info, "dwFlags"); + si.hStdInput = gethandle(startup_info, "hStdInput"); + si.hStdOutput = gethandle(startup_info, "hStdOutput"); + si.hStdError = gethandle(startup_info, "hStdError"); - Py_BEGIN_ALLOW_THREADS - result = CreateProcess( - application_name, command_line, NULL, NULL, inherit_handles, - creation_flags, environment ? PyString_AS_STRING(environment) : NULL, - current_directory, &si, &pi - ); - Py_END_ALLOW_THREADS + if (env_mapping == Py_None) + environment = NULL; + else { + environment = getenvironment(env_mapping); + if (! environment) + return NULL; + } - Py_XDECREF(environment); + Py_BEGIN_ALLOW_THREADS + result = CreateProcess(application_name, + command_line, + NULL, + NULL, + inherit_handles, + creation_flags, + environment ? PyString_AS_STRING(environment) : NULL, + current_directory, + &si, + &pi); + Py_END_ALLOW_THREADS - if (!result) - return PyErr_SetFromWindowsErr(GetLastError()); + Py_XDECREF(environment); - return Py_BuildValue( - "NNii", sp_handle_new(pi.hProcess), sp_handle_new(pi.hThread), - pi.dwProcessId, pi.dwThreadId - ); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); + + return Py_BuildValue("NNii", + sp_handle_new(pi.hProcess), + sp_handle_new(pi.hThread), + pi.dwProcessId, + pi.dwThreadId); } static PyObject * sp_GetExitCodeProcess(PyObject* self, PyObject* args) { - DWORD exit_code; - BOOL result; + DWORD exit_code; + BOOL result; - long process; - if (!PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process)) - return NULL; + long process; + if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process)) + return NULL; - result = GetExitCodeProcess((HANDLE) process, &exit_code); + result = GetExitCodeProcess((HANDLE) process, &exit_code); - if (!result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyInt_FromLong(exit_code); + return PyInt_FromLong(exit_code); } static PyObject * sp_WaitForSingleObject(PyObject* self, PyObject* args) { - DWORD result; + DWORD result; - long handle; - int milliseconds; - if (!PyArg_ParseTuple(args, "li:WaitForSingleObject", - &handle, &milliseconds)) - return NULL; + long handle; + int milliseconds; + if (! PyArg_ParseTuple(args, "li:WaitForSingleObject", + &handle, + &milliseconds)) + return NULL; - Py_BEGIN_ALLOW_THREADS - result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds); + Py_END_ALLOW_THREADS - if (result == WAIT_FAILED) - return PyErr_SetFromWindowsErr(GetLastError()); + if (result == WAIT_FAILED) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyInt_FromLong((int) result); + return PyInt_FromLong((int) result); } static PyObject * sp_GetVersion(PyObject* self, PyObject* args) { - if (!PyArg_ParseTuple(args, ":GetVersion")) - return NULL; + if (! PyArg_ParseTuple(args, ":GetVersion")) + return NULL; - return PyInt_FromLong((int) GetVersion()); + return PyInt_FromLong((int) GetVersion()); } static PyObject * sp_GetModuleFileName(PyObject* self, PyObject* args) { - BOOL result; - long module; - TCHAR filename[MAX_PATH]; + BOOL result; + long module; + TCHAR filename[MAX_PATH]; - if (!PyArg_ParseTuple(args, "l:GetModuleFileName", &module)) - return NULL; + if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module)) + return NULL; - result = GetModuleFileName((HMODULE)module, filename, MAX_PATH); - filename[MAX_PATH-1] = '\0'; + result = GetModuleFileName((HMODULE)module, filename, MAX_PATH); + filename[MAX_PATH-1] = '\0'; - if (!result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyString_FromString(filename); + return PyString_FromString(filename); } static PyMethodDef sp_functions[] = { - {"GetStdHandle", sp_GetStdHandle, METH_VARARGS}, - {"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS}, - {"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS}, - {"CreatePipe", sp_CreatePipe, METH_VARARGS}, - {"CreateProcess", sp_CreateProcess, METH_VARARGS}, - {"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS}, - {"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS}, - {"GetVersion", sp_GetVersion, METH_VARARGS}, - {"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS}, - {NULL, NULL} + {"GetStdHandle", sp_GetStdHandle, METH_VARARGS}, + {"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS}, + {"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS}, + {"CreatePipe", sp_CreatePipe, METH_VARARGS}, + {"CreateProcess", sp_CreateProcess, METH_VARARGS}, + {"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS}, + {"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS}, + {"GetVersion", sp_GetVersion, METH_VARARGS}, + {"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS}, + {NULL, NULL} }; /* -------------------------------------------------------------------- */ @@ -475,11 +500,11 @@ static void defint(PyObject* d, const char* name, int value) { - PyObject* v = PyInt_FromLong((long) value); - if (v) { - PyDict_SetItemString(d, (char*) name, v); - Py_DECREF(v); - } + PyObject* v = PyInt_FromLong((long) value); + if (v) { + PyDict_SetItemString(d, (char*) name, v); + Py_DECREF(v); + } } #if PY_VERSION_HEX >= 0x02030000 @@ -489,23 +514,23 @@ #endif init_subprocess() { - PyObject *d; - PyObject *m; + PyObject *d; + PyObject *m; - /* patch up object descriptors */ - sp_handle_type.ob_type = &PyType_Type; - sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int; + /* patch up object descriptors */ + sp_handle_type.ob_type = &PyType_Type; + sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int; - m = Py_InitModule("_subprocess", sp_functions); - d = PyModule_GetDict(m); + m = Py_InitModule("_subprocess", sp_functions); + d = PyModule_GetDict(m); - /* constants */ - defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE); - defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE); - defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE); - defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS); - defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES); - defint(d, "INFINITE", INFINITE); - defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0); - defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE); + /* constants */ + defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE); + defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE); + defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE); + defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS); + defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES); + defint(d, "INFINITE", INFINITE); + defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0); + defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE); }

1 0

python/dist/src/Lib pdb.py,1.69,1.70
by jlgijsbers＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31804 Modified Files: pdb.py Log Message: Improvements when running pdb as a script. Bug fixes: * Use fresh copy of globals/locals so the script being debugged can't access the pdb namespace (e.g.: p line_prefix will no longer work). * Remove pdb.py's path from sys.path. Having it in there is normally not a problem, but it could prove irritating when messing with PYTHONPATH or invoking pdb via /usr/bin/pdf. * You can now set a breakpoint on the script being debugged, even if the script doesn't end with a '.py' extension. Also, setting breakpoints with absolute paths now works reliably. Enhancements: * Go directly to the first line of the script. * Enter post-mortem debugging if the script being debugged doesn't catch an exception. * Restart the script being debugged and preserve debugger state when the script being debugged exits. Cleanup: * Moved the __main__ method into a main() function. * Kill the (undocumented, not in __all__) mainmodule/mainpyfile globals, add a mainpyfile attribute to pdb. Thanks Ilya Sandler for the patch! Index: pdb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pdb.py,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- pdb.py 30 Aug 2004 13:29:44 -0000 1.69 +++ pdb.py 12 Oct 2004 18:12:09 -0000 1.70 @@ -12,7 +12,7 @@ import os import re import pprint - +import traceback # Create a custom safe Repr instance and increase its maxstring. # The default of 30 truncates error messages too easily. _repr = Repr() @@ -57,6 +57,8 @@ cmd.Cmd.__init__(self) self.prompt = '(Pdb) ' self.aliases = {} + self.mainpyfile = '' + self._wait_for_mainpyfile = 0 # Try to load readline if it exists try: import readline @@ -117,12 +119,19 @@ def user_call(self, frame, argument_list): """This method is called when there is the remote possibility that we ever need to stop in this function.""" + if self._wait_for_mainpyfile: + return if self.stop_here(frame): print '--Call--' self.interaction(frame, None) def user_line(self, frame): """This function is called when we stop or break at this line.""" + if self._wait_for_mainpyfile: + if (self.mainpyfile != self.canonic(frame.f_code.co_filename) + or frame.f_lineno<= 0): + return + self._wait_for_mainpyfile = 0 self.interaction(frame, None) def user_return(self, frame, return_value): @@ -281,8 +290,8 @@ def defaultFile(self): """Produce a reasonable default.""" filename = self.curframe.f_code.co_filename - if filename == '<string>' and mainpyfile: - filename = mainpyfile + if filename == '<string>' and self.mainpyfile: + filename = self.mainpyfile return filename do_b = do_break @@ -525,13 +534,16 @@ self.lastcmd = p.lastcmd def do_quit(self, arg): + self._user_requested_quit = 1 self.set_quit() return 1 + do_q = do_quit do_exit = do_quit def do_EOF(self, arg): print + self._user_requested_quit = 1 self.set_quit() return 1 @@ -928,7 +940,16 @@ help() def lookupmodule(self, filename): - """Helper function for break/clear parsing -- may be overridden.""" + """Helper function for break/clear parsing -- may be overridden. + + lookupmodule() translates (possibly incomplete) file or module name + into an absolute file name. + """ + if os.path.isabs(filename) and os.path.exists(filename): + return filename + f = os.path.join(sys.path[0], filename) + if os.path.exists(f) and self.canonic(f) == self.mainpyfile: + return f root, ext = os.path.splitext(filename) if ext == '': filename = filename + '.py' @@ -942,6 +963,24 @@ return fullname return None + def _runscript(self, filename): + # Start with fresh empty copy of globals and locals and tell the script + # that it's being run as __main__ to avoid scripts being able to access + # the pdb.py namespace. + globals_ = {"__name__" : "__main__"} + locals_ = globals_ + + # When bdb sets tracing, a number of call and line events happens + # BEFORE debugger even reaches user's code (and the exact sequence of + # events depends on python version). So we take special measures to + # avoid stopping before we reach the main script (see user_line and + # user_call for details). + self._wait_for_mainpyfile = 1 + self.mainpyfile = self.canonic(filename) + self._user_requested_quit = 0 + statement = 'execfile( "%s")' % filename + self.run(statement, globals=globals_, locals=locals_) + # Simplified interface def run(statement, globals=None, locals=None): @@ -992,23 +1031,49 @@ print 'Sorry, can\'t find the help file "pdb.doc"', print 'along the Python search path' -mainmodule = '' -mainpyfile = '' - -# When invoked as main program, invoke the debugger on a script -if __name__=='__main__': +def main(): if not sys.argv[1:]: print "usage: pdb.py scriptfile [arg] ..." sys.exit(2) - mainpyfile = filename = sys.argv[1] # Get script filename - if not os.path.exists(filename): - print 'Error:', repr(filename), 'does not exist' + mainpyfile = sys.argv[1] # Get script filename + if not os.path.exists(mainpyfile): + print 'Error:', mainpyfile, 'does not exist' sys.exit(1) - mainmodule = os.path.basename(filename) + del sys.argv[0] # Hide "pdb.py" from argument list - # Insert script directory in front of module search path - sys.path.insert(0, os.path.dirname(filename)) + # Replace pdb's dir with script's dir in front of module search path. + sys.path[0] = os.path.dirname(mainpyfile) - run('execfile(%r)' % (filename,)) + # Note on saving/restoring sys.argv: it's a good idea when sys.argv was + # modified by the script being debugged. It's a bad idea when it was + # changed by the user from the command line. The best approach would be to + # have a "restart" command which would allow explicit specification of + # command line arguments. + pdb = Pdb() + while 1: + try: + pdb._runscript(mainpyfile) + if pdb._user_requested_quit: + break + print "The program finished and will be restarted" + except SystemExit: + # In most cases SystemExit does not warrant a post-mortem session. + print "The program exited via sys.exit(). Exit status: ", + print sys.exc_info()[1] + except: + traceback.print_exc() + print "Uncaught exception. Entering post mortem debugging" + print "Running 'cont' or 'step' will restart the program" + t = sys.exc_info()[2] + while t.tb_next is not None: + t = t.tb_next + pdb.interaction(t.tb_frame,t) + print "Post mortem debugger finished. The "+mainpyfile+" will be restarted" + + +# When invoked as main program, invoke the debugger on a script +if __name__=='__main__': + main() +

1 0

python/dist/src/Lib subprocess.py,1.1,1.2
by akuchling＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9837 Modified Files: subprocess.py Log Message: Typo fix Index: subprocess.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/subprocess.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- subprocess.py 12 Oct 2004 15:26:27 -0000 1.1 +++ subprocess.py 12 Oct 2004 16:38:42 -0000 1.2 @@ -711,7 +711,7 @@ self.pid = pid ht.Close() - # Child is launched. Close the parents copy of those pipe + # 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

1 0

python/nondist/peps pep-0324.txt,1.5,1.6
by akuchling＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9582 Modified Files: pep-0324.txt Log Message: Typo fixes Index: pep-0324.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0324.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pep-0324.txt 12 Oct 2004 15:48:03 -0000 1.5 +++ pep-0324.txt 12 Oct 2004 16:37:47 -0000 1.6 @@ -223,7 +223,7 @@ new process. - If universal_newlines is true, the file objects stdout and - stderr are opened as a text files, but lines may be terminated + stderr are opened as a text file, but lines may be terminated by any of '\n', the Unix end-of-line convention, '\r', the Macintosh convention or '\r\n', the Windows convention. All of these external representations are seen as '\n' by the Python @@ -500,7 +500,7 @@ * expect-like functionality, including pty support. pty support is highly platform-dependent, which is a - problem. Also, there are already other modules that provides this + problem. Also, there are already other modules that provide this kind of functionality[6].

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.109, 1.110
by akuchling＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9392 Modified Files: whatsnew24.tex Log Message: Finish off PEP 324 section; fix Peter's last name Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- whatsnew24.tex 12 Oct 2004 15:58:02 -0000 1.109 +++ whatsnew24.tex 12 Oct 2004 16:36:57 -0000 1.110 @@ -440,14 +440,79 @@ The \module{subprocess} module cleans all this up, providing a unified interface that offers all the features you might need. +Instead of \module{popen2}'s collection of classes, +\module{subprocess} contains a single class called \class{Popen} +whose constructor supports a number of different keyword arguments. -% XXX finish writing this section by adding some examples +\begin{verbatim} +class Popen(args, bufsize=0, executable=None, + stdin=None, stdout=None, stderr=None, + preexec_fn=None, close_fds=False, shell=False, + cwd=None, env=None, universal_newlines=False, + startupinfo=None, creationflags=0): +\end{verbatim} + +\var{args} is commonly a sequence of strings that will be the arguments to +the program executed as the subprocess. (If the \var{shell} argument is true, +\var{args} can be a string which will then be passed on to the shell for interpretation.) + +\var{stdin}, \var{stdout}, and \var{stderr} specify what the +subprocess's input, output, and error streams will be. You can +provide a file object or a file descriptor, or you can +use \code{subprocess.PIPE} to create a pipe between the subprocess +and the parent. + +The constructor has a number of handy options: + +\begin{itemize} + \item \var{close_fds} requests that all file descriptors be closed before running the subprocess. + \item \var{cwd} specifies the working directory in which the subprocess will be executed (defaulting to whatever the parent's working directory is). + \item \var{env} is a dictionary specifying environment variables. + \item \var{preexec_fn} is a function that gets called before the child is started. + \item \var{universal_newlines} opens the child's input and output using +Python's universal newline feature. +\end{itemize} + +Once you've created the \class{Popen} instance, +you can call \method{wait()} to pause until the subprocess has exited, +\method{poll()} to check if it's exited without pausing, +or \method{communicate(\var{data})} to send the string \var{data} to +the subprocess's standard input. \method{communicate(\var{data})} +then reads any data that the subprocess has sent to its standard output or error, returning a tuple \code{(\var{stdout_data}, \var{stderr_data})}. + +\function{call()} is a shortcut that passes its arguments along to +the \class{Popen} constructor, waits for the command to complete, and +returns the status code of the subprocess. It can serve as an analog +to +\function{os.system()}: + +\begin{verbatim} +sts = subprocess.call(['dpkg', '-i', '/tmp/new-package.deb']) +if sts == 0: + # Success + ... +else: + # dpkg returned an error + ... +\end{verbatim} + +The command is invoked without use of the shell. If you really do want to +use the shell, you can add \code{shell=True} as a keyword argument and provide +a string instead of a sequence: + +\begin{verbatim} +sts = subprocess.call('dpkg -i /tmp/new-package.deb', shell=True) +\end{verbatim} +The PEP takes various examples of shell and Python code and shows how +they'd be translated into Python code that uses \module{subprocess}. +Reading this section of the PEP is highly recommended. \begin{seealso} -\seepep{324}{subprocess - New process module}{Written and implemented by Peter Astrand, with assistance from Fredrik Lundh and others.} +\seepep{324}{subprocess - New process module}{Written and implemented by Peter {\AA}strand, with assistance from Fredrik Lundh and others.} \end{seealso} + %====================================================================== \section{PEP 327: Decimal Data Type} @@ -1491,6 +1556,7 @@ The author would like to thank the following people for offering suggestions, corrections and assistance with various drafts of this -article: Hye-Shik Chang, Michael Dyck, Raymond Hettinger, Hamish Lawson. +article: Hye-Shik Chang, Michael Dyck, Raymond Hettinger, Hamish Lawson, +Fredrik Lundh. \end{document}

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.108, 1.109
by akuchling＠users.sourceforge.net 12 Oct '04

12 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv308 Modified Files: whatsnew24.tex Log Message: Start section for PEP 324 Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- whatsnew24.tex 11 Oct 2004 19:20:06 -0000 1.108 +++ whatsnew24.tex 12 Oct 2004 15:58:02 -0000 1.109 @@ -427,6 +427,28 @@ %====================================================================== +\section{PEP 324: New subprocess Module} + +The standard library provides a number of ways to +execute a subprocess, each of which offers different features and +levels of difficulty. \function{os.system(\var{command})} is easy, but +slow -- it runs a shell process which executes the command -- +and dangerous -- you have to be careful about escaping metacharacters. +The \module{popen2} module offers classes that can capture +standard output and standard error from the subprocess, but the naming +is confusing. + +The \module{subprocess} module cleans all this up, providing a unified +interface that offers all the features you might need. + +% XXX finish writing this section by adding some examples + + +\begin{seealso} +\seepep{324}{subprocess - New process module}{Written and implemented by Peter Astrand, with assistance from Fredrik Lundh and others.} +\end{seealso} + +%====================================================================== \section{PEP 327: Decimal Data Type} Python has always supported floating-point (FP) numbers as a data

1 0