2004-10-12 12:26:28 -03:00
|
|
|
/*
|
|
|
|
* support routines for subprocess module
|
|
|
|
*
|
|
|
|
* Currently, this extension module is only required when using the
|
|
|
|
* subprocess module on Windows, but in the future, stubs for other
|
2004-10-12 18:38:22 -03:00
|
|
|
* platforms might be added here as well.
|
2004-10-12 12:26:28 -03:00
|
|
|
*
|
|
|
|
* Copyright (c) 2004 by Fredrik Lundh <fredrik@pythonware.com>
|
|
|
|
* Copyright (c) 2004 by Secret Labs AB, http://www.pythonware.com
|
|
|
|
* Copyright (c) 2004 by Peter Astrand <astrand@lysator.liu.se>
|
2004-10-12 18:38:22 -03:00
|
|
|
*
|
2004-10-12 12:26:28 -03:00
|
|
|
* 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:
|
2004-10-12 18:38:22 -03:00
|
|
|
*
|
2004-10-12 12:26:28 -03:00
|
|
|
* 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
|
|
|
|
* all copies, and that both that copyright notice and this permission
|
|
|
|
* notice appear in supporting documentation, and that the name of the
|
|
|
|
* authors not be used in advertising or publicity pertaining to
|
|
|
|
* distribution of the software without specific, written prior
|
|
|
|
* permission.
|
2004-10-12 18:38:22 -03:00
|
|
|
*
|
2004-10-12 12:26:28 -03:00
|
|
|
* 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
|
|
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
|
|
* 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.
|
2004-10-12 18:38:22 -03:00
|
|
|
*
|
2004-10-12 12:26:28 -03:00
|
|
|
*/
|
|
|
|
|
2005-12-14 18:29:34 -04:00
|
|
|
/* Licensed to PSF under a Contributor Agreement. */
|
|
|
|
/* See http://www.python.org/2.4/license for licensing details. */
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
#include "Python.h"
|
|
|
|
|
|
|
|
#define WINDOWS_LEAN_AND_MEAN
|
|
|
|
#include "windows.h"
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/* handle wrapper. note that this library uses integers when passing
|
|
|
|
handles to a function, and handle wrappers when returning handles.
|
|
|
|
the wrapper is used to provide Detach and Close methods */
|
|
|
|
|
|
|
|
typedef struct {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject_HEAD
|
|
|
|
HANDLE handle;
|
2004-10-12 12:26:28 -03:00
|
|
|
} sp_handle_object;
|
|
|
|
|
2006-03-22 05:28:35 -04:00
|
|
|
static PyTypeObject sp_handle_type;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
sp_handle_new(HANDLE handle)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
sp_handle_object* self;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
self = PyObject_NEW(sp_handle_object, &sp_handle_type);
|
|
|
|
if (self == NULL)
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
self->handle = handle;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return (PyObject*) self;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
#if defined(MS_WIN32) && !defined(MS_WIN64)
|
2010-05-09 12:52:27 -03:00
|
|
|
#define HANDLE_TO_PYNUM(handle) PyLong_FromLong((long) handle)
|
|
|
|
#define PY_HANDLE_PARAM "l"
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
#else
|
2010-05-09 12:52:27 -03:00
|
|
|
#define HANDLE_TO_PYNUM(handle) PyLong_FromLongLong((long long) handle)
|
|
|
|
#define PY_HANDLE_PARAM "L"
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
#endif
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject*
|
|
|
|
sp_handle_detach(sp_handle_object* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE handle;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, ":Detach"))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
handle = self->handle;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
self->handle = INVALID_HANDLE_VALUE;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* note: return the current handle, as an integer */
|
|
|
|
return HANDLE_TO_PYNUM(handle);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
sp_handle_close(sp_handle_object* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
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;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
sp_handle_dealloc(sp_handle_object* self)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (self->handle != INVALID_HANDLE_VALUE)
|
|
|
|
CloseHandle(self->handle);
|
|
|
|
PyObject_FREE(self);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef sp_handle_methods[] = {
|
2010-05-09 12:52:27 -03:00
|
|
|
{"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS},
|
|
|
|
{"Close", (PyCFunction) sp_handle_close, METH_VARARGS},
|
|
|
|
{NULL, NULL}
|
2004-10-12 12:26:28 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
sp_handle_as_int(sp_handle_object* self)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
return HANDLE_TO_PYNUM(self->handle);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyNumberMethods sp_handle_as_number;
|
|
|
|
|
2006-03-22 05:28:35 -04:00
|
|
|
static PyTypeObject sp_handle_type = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
|
|
"_subprocess_handle", sizeof(sp_handle_object), 0,
|
|
|
|
(destructor) sp_handle_dealloc, /*tp_dealloc*/
|
|
|
|
0, /*tp_print*/
|
|
|
|
0, /*tp_getattr*/
|
|
|
|
0, /*tp_setattr*/
|
|
|
|
0, /*tp_reserved*/
|
|
|
|
0, /*tp_repr*/
|
|
|
|
&sp_handle_as_number, /*tp_as_number */
|
|
|
|
0, /*tp_as_sequence */
|
|
|
|
0, /*tp_as_mapping */
|
|
|
|
0, /*tp_hash*/
|
|
|
|
0, /*tp_call*/
|
|
|
|
0, /*tp_str*/
|
|
|
|
0, /*tp_getattro*/
|
|
|
|
0, /*tp_setattro*/
|
|
|
|
0, /*tp_as_buffer*/
|
|
|
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
|
|
|
0, /*tp_doc*/
|
|
|
|
0, /*tp_traverse*/
|
|
|
|
0, /*tp_clear*/
|
|
|
|
0, /*tp_richcompare*/
|
|
|
|
0, /*tp_weaklistoffset*/
|
|
|
|
0, /*tp_iter*/
|
|
|
|
0, /*tp_iternext*/
|
|
|
|
sp_handle_methods, /*tp_methods*/
|
2004-10-12 12:26:28 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/* windows API functions */
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(GetStdHandle_doc,
|
|
|
|
"GetStdHandle(handle) -> integer\n\
|
|
|
|
\n\
|
|
|
|
Return a handle to the specified standard device\n\
|
|
|
|
(STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE).\n\
|
|
|
|
The integer associated with the handle object is returned.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_GetStdHandle(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE handle;
|
|
|
|
int std_handle;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
handle = GetStdHandle((DWORD) std_handle);
|
|
|
|
Py_END_ALLOW_THREADS
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (handle == INVALID_HANDLE_VALUE)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! handle) {
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
|
|
|
}
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* note: returns integer, not handle object */
|
|
|
|
return HANDLE_TO_PYNUM(handle);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(GetCurrentProcess_doc,
|
|
|
|
"GetCurrentProcess() -> handle\n\
|
|
|
|
\n\
|
|
|
|
Return a handle object for the current process.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_GetCurrentProcess(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, ":GetCurrentProcess"))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return sp_handle_new(GetCurrentProcess());
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(DuplicateHandle_doc,
|
|
|
|
"DuplicateHandle(source_proc_handle, source_handle,\n\
|
|
|
|
target_proc_handle, target_handle, access,\n\
|
|
|
|
inherit[, options]) -> handle\n\
|
|
|
|
\n\
|
|
|
|
Return a duplicate handle object.\n\
|
|
|
|
\n\
|
|
|
|
The duplicate handle refers to the same object as the original\n\
|
|
|
|
handle. Therefore, any changes to the object are reflected\n\
|
|
|
|
through both handles.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_DuplicateHandle(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE target_handle;
|
|
|
|
BOOL result;
|
|
|
|
|
|
|
|
HANDLE source_process_handle;
|
|
|
|
HANDLE source_handle;
|
|
|
|
HANDLE target_process_handle;
|
|
|
|
int desired_access;
|
|
|
|
int inherit_handle;
|
|
|
|
int options = 0;
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple(args,
|
|
|
|
PY_HANDLE_PARAM PY_HANDLE_PARAM PY_HANDLE_PARAM
|
|
|
|
"ii|i:DuplicateHandle",
|
|
|
|
&source_process_handle,
|
|
|
|
&source_handle,
|
|
|
|
&target_process_handle,
|
|
|
|
&desired_access,
|
|
|
|
&inherit_handle,
|
|
|
|
&options))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
result = DuplicateHandle(
|
|
|
|
source_process_handle,
|
|
|
|
source_handle,
|
|
|
|
target_process_handle,
|
|
|
|
&target_handle,
|
|
|
|
desired_access,
|
|
|
|
inherit_handle,
|
|
|
|
options
|
|
|
|
);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
|
|
|
|
|
|
|
return sp_handle_new(target_handle);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(CreatePipe_doc,
|
|
|
|
"CreatePipe(pipe_attrs, size) -> (read_handle, write_handle)\n\
|
|
|
|
\n\
|
|
|
|
Create an anonymous pipe, and return handles to the read and\n\
|
|
|
|
write ends of the pipe.\n\
|
|
|
|
\n\
|
|
|
|
pipe_attrs is ignored internally and can be None.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_CreatePipe(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE read_pipe;
|
|
|
|
HANDLE write_pipe;
|
|
|
|
BOOL result;
|
2004-10-12 18:38:22 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* pipe_attributes; /* ignored */
|
|
|
|
int size;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
result = CreatePipe(&read_pipe, &write_pipe, NULL, size);
|
|
|
|
Py_END_ALLOW_THREADS
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return Py_BuildValue(
|
|
|
|
"NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe));
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* helpers for createprocess */
|
|
|
|
|
|
|
|
static int
|
|
|
|
getint(PyObject* obj, char* name)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* value;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
value = PyObject_GetAttrString(obj, name);
|
|
|
|
if (! value) {
|
|
|
|
PyErr_Clear(); /* FIXME: propagate error? */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ret = (int) PyLong_AsLong(value);
|
|
|
|
Py_DECREF(value);
|
|
|
|
return ret;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
2004-10-12 18:38:22 -03:00
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static HANDLE
|
|
|
|
gethandle(PyObject* obj, char* name)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
sp_handle_object* value;
|
|
|
|
HANDLE ret;
|
|
|
|
|
|
|
|
value = (sp_handle_object*) PyObject_GetAttrString(obj, name);
|
|
|
|
if (! value) {
|
|
|
|
PyErr_Clear(); /* FIXME: propagate error? */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (Py_TYPE(value) != &sp_handle_type)
|
|
|
|
ret = NULL;
|
|
|
|
else
|
|
|
|
ret = value->handle;
|
|
|
|
Py_DECREF(value);
|
|
|
|
return ret;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
getenvironment(PyObject* environment)
|
|
|
|
{
|
2011-09-28 02:41:54 -03:00
|
|
|
Py_ssize_t i, envsize, totalsize;
|
|
|
|
Py_UCS4 *buffer = NULL, *p, *end;
|
|
|
|
PyObject *keys, *values, *res;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* convert environment dictionary to windows enviroment string */
|
|
|
|
if (! PyMapping_Check(environment)) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_TypeError, "environment must be dictionary or None");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
envsize = PyMapping_Length(environment);
|
|
|
|
|
|
|
|
keys = PyMapping_Keys(environment);
|
|
|
|
values = PyMapping_Values(environment);
|
|
|
|
if (!keys || !values)
|
|
|
|
goto error;
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
totalsize = 1; /* trailing null character */
|
2010-05-09 12:52:27 -03:00
|
|
|
for (i = 0; i < envsize; i++) {
|
|
|
|
PyObject* key = PyList_GET_ITEM(keys, i);
|
|
|
|
PyObject* value = PyList_GET_ITEM(values, i);
|
|
|
|
|
|
|
|
if (! PyUnicode_Check(key) || ! PyUnicode_Check(value)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"environment can only contain strings");
|
|
|
|
goto error;
|
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
totalsize += PyUnicode_GET_LENGTH(key) + 1; /* +1 for '=' */
|
|
|
|
totalsize += PyUnicode_GET_LENGTH(value) + 1; /* +1 for '\0' */
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer = PyMem_Malloc(totalsize * sizeof(Py_UCS4));
|
|
|
|
if (! buffer)
|
|
|
|
goto error;
|
|
|
|
p = buffer;
|
|
|
|
end = buffer + totalsize;
|
|
|
|
|
|
|
|
for (i = 0; i < envsize; i++) {
|
|
|
|
PyObject* key = PyList_GET_ITEM(keys, i);
|
|
|
|
PyObject* value = PyList_GET_ITEM(values, i);
|
|
|
|
if (!PyUnicode_AsUCS4(key, p, end - p, 0))
|
|
|
|
goto error;
|
|
|
|
p += PyUnicode_GET_LENGTH(key);
|
2010-05-09 12:52:27 -03:00
|
|
|
*p++ = '=';
|
2011-09-28 02:41:54 -03:00
|
|
|
if (!PyUnicode_AsUCS4(value, p, end - p, 0))
|
|
|
|
goto error;
|
|
|
|
p += PyUnicode_GET_LENGTH(value);
|
2010-05-09 12:52:27 -03:00
|
|
|
*p++ = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add trailing null byte */
|
|
|
|
*p++ = '\0';
|
2011-09-28 02:41:54 -03:00
|
|
|
assert(p == end);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
Py_XDECREF(keys);
|
|
|
|
Py_XDECREF(values);
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
res = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, p - buffer);
|
|
|
|
PyMem_Free(buffer);
|
|
|
|
return res;
|
2004-10-12 18:38:22 -03:00
|
|
|
|
|
|
|
error:
|
2011-09-28 02:41:54 -03:00
|
|
|
PyMem_Free(buffer);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(keys);
|
|
|
|
Py_XDECREF(values);
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(CreateProcess_doc,
|
|
|
|
"CreateProcess(app_name, cmd_line, proc_attrs, thread_attrs,\n\
|
|
|
|
inherit, flags, env_mapping, curdir,\n\
|
|
|
|
startup_info) -> (proc_handle, thread_handle,\n\
|
|
|
|
pid, tid)\n\
|
|
|
|
\n\
|
|
|
|
Create a new process and its primary thread. The return\n\
|
|
|
|
value is a tuple of the process handle, thread handle,\n\
|
|
|
|
process ID, and thread ID.\n\
|
|
|
|
\n\
|
|
|
|
proc_attrs and thread_attrs are ignored internally and can be None.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_CreateProcess(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
BOOL result;
|
|
|
|
PROCESS_INFORMATION pi;
|
|
|
|
STARTUPINFOW si;
|
|
|
|
PyObject* environment;
|
2011-11-20 21:01:41 -04:00
|
|
|
wchar_t *wenvironment;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2011-11-21 21:27:30 -04:00
|
|
|
wchar_t* application_name;
|
|
|
|
wchar_t* command_line;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* process_attributes; /* ignored */
|
|
|
|
PyObject* thread_attributes; /* ignored */
|
|
|
|
int inherit_handles;
|
|
|
|
int creation_flags;
|
|
|
|
PyObject* env_mapping;
|
2011-11-21 21:27:30 -04:00
|
|
|
wchar_t* current_directory;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* startup_info;
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess",
|
|
|
|
&application_name,
|
|
|
|
&command_line,
|
|
|
|
&process_attributes,
|
|
|
|
&thread_attributes,
|
|
|
|
&inherit_handles,
|
|
|
|
&creation_flags,
|
|
|
|
&env_mapping,
|
|
|
|
¤t_directory,
|
|
|
|
&startup_info))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ZeroMemory(&si, sizeof(si));
|
|
|
|
si.cb = sizeof(si);
|
|
|
|
|
|
|
|
/* note: we only support a small subset of all SI attributes */
|
|
|
|
si.dwFlags = getint(startup_info, "dwFlags");
|
|
|
|
si.wShowWindow = getint(startup_info, "wShowWindow");
|
|
|
|
si.hStdInput = gethandle(startup_info, "hStdInput");
|
|
|
|
si.hStdOutput = gethandle(startup_info, "hStdOutput");
|
|
|
|
si.hStdError = gethandle(startup_info, "hStdError");
|
|
|
|
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
|
2011-11-21 21:27:30 -04:00
|
|
|
if (env_mapping != Py_None) {
|
2010-05-09 12:52:27 -03:00
|
|
|
environment = getenvironment(env_mapping);
|
|
|
|
if (! environment)
|
|
|
|
return NULL;
|
2011-11-20 21:17:08 -04:00
|
|
|
wenvironment = PyUnicode_AsUnicode(environment);
|
2011-11-20 21:01:41 -04:00
|
|
|
if (wenvironment == NULL)
|
|
|
|
{
|
|
|
|
Py_XDECREF(environment);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2011-11-21 21:27:30 -04:00
|
|
|
else {
|
|
|
|
environment = NULL;
|
2011-11-20 21:01:41 -04:00
|
|
|
wenvironment = NULL;
|
2011-11-21 21:27:30 -04:00
|
|
|
}
|
2011-11-20 21:01:41 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
result = CreateProcessW(application_name,
|
|
|
|
command_line,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
inherit_handles,
|
|
|
|
creation_flags | CREATE_UNICODE_ENVIRONMENT,
|
2011-11-20 21:01:41 -04:00
|
|
|
wenvironment,
|
2010-05-09 12:52:27 -03:00
|
|
|
current_directory,
|
|
|
|
&si,
|
|
|
|
&pi);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
|
|
|
Py_XDECREF(environment);
|
|
|
|
|
2010-08-08 08:18:16 -03:00
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
return Py_BuildValue("NNii",
|
|
|
|
sp_handle_new(pi.hProcess),
|
|
|
|
sp_handle_new(pi.hThread),
|
|
|
|
pi.dwProcessId,
|
|
|
|
pi.dwThreadId);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(TerminateProcess_doc,
|
|
|
|
"TerminateProcess(handle, exit_code) -> None\n\
|
|
|
|
\n\
|
|
|
|
Terminate the specified process and all of its threads.");
|
|
|
|
|
2005-12-18 17:06:46 -04:00
|
|
|
static PyObject *
|
|
|
|
sp_TerminateProcess(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
BOOL result;
|
2005-12-18 17:06:46 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE process;
|
|
|
|
int exit_code;
|
|
|
|
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:TerminateProcess",
|
|
|
|
&process, &exit_code))
|
|
|
|
return NULL;
|
2005-12-18 17:06:46 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
result = TerminateProcess(process, exit_code);
|
2005-12-18 17:06:46 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2005-12-18 17:06:46 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
2005-12-18 17:06:46 -04:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(GetExitCodeProcess_doc,
|
|
|
|
"GetExitCodeProcess(handle) -> Exit code\n\
|
|
|
|
\n\
|
|
|
|
Return the termination status of the specified process.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_GetExitCodeProcess(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
DWORD exit_code;
|
|
|
|
BOOL result;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE process;
|
|
|
|
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetExitCodeProcess", &process))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
result = GetExitCodeProcess(process, &exit_code);
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyLong_FromLong(exit_code);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(WaitForSingleObject_doc,
|
|
|
|
"WaitForSingleObject(handle, timeout) -> result\n\
|
|
|
|
\n\
|
|
|
|
Wait until the specified object is in the signaled state or\n\
|
|
|
|
the time-out interval elapses. The timeout value is specified\n\
|
|
|
|
in milliseconds.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_WaitForSingleObject(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
DWORD result;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
HANDLE handle;
|
|
|
|
int milliseconds;
|
|
|
|
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:WaitForSingleObject",
|
|
|
|
&handle,
|
|
|
|
&milliseconds))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
result = WaitForSingleObject(handle, (DWORD) milliseconds);
|
|
|
|
Py_END_ALLOW_THREADS
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (result == WAIT_FAILED)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyLong_FromLong((int) result);
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(GetVersion_doc,
|
|
|
|
"GetVersion() -> version\n\
|
|
|
|
\n\
|
|
|
|
Return the version number of the current operating system.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_GetVersion(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, ":GetVersion"))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyLong_FromLong((int) GetVersion());
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2010-04-24 13:19:22 -03:00
|
|
|
PyDoc_STRVAR(GetModuleFileName_doc,
|
|
|
|
"GetModuleFileName(module) -> path\n\
|
|
|
|
\n\
|
|
|
|
Return the fully-qualified path for the file that contains\n\
|
|
|
|
the specified module. The module must have been loaded by the\n\
|
|
|
|
current process.\n\
|
|
|
|
\n\
|
|
|
|
The module parameter should be a handle to the loaded module\n\
|
|
|
|
whose path is being requested. If this parameter is 0, \n\
|
|
|
|
GetModuleFileName retrieves the path of the executable file\n\
|
|
|
|
of the current process.");
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
static PyObject *
|
|
|
|
sp_GetModuleFileName(PyObject* self, PyObject* args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
BOOL result;
|
|
|
|
HMODULE module;
|
|
|
|
WCHAR filename[MAX_PATH];
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetModuleFileName",
|
|
|
|
&module))
|
|
|
|
return NULL;
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
result = GetModuleFileNameW(module, filename, MAX_PATH);
|
|
|
|
filename[MAX_PATH-1] = '\0';
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (! result)
|
|
|
|
return PyErr_SetFromWindowsErr(GetLastError());
|
2004-10-12 12:26:28 -03:00
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
return PyUnicode_FromWideChar(filename, wcslen(filename));
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef sp_functions[] = {
|
2010-05-09 12:52:27 -03:00
|
|
|
{"GetStdHandle", sp_GetStdHandle, METH_VARARGS, GetStdHandle_doc},
|
|
|
|
{"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS,
|
|
|
|
GetCurrentProcess_doc},
|
|
|
|
{"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS,
|
|
|
|
DuplicateHandle_doc},
|
|
|
|
{"CreatePipe", sp_CreatePipe, METH_VARARGS, CreatePipe_doc},
|
|
|
|
{"CreateProcess", sp_CreateProcess, METH_VARARGS, CreateProcess_doc},
|
|
|
|
{"TerminateProcess", sp_TerminateProcess, METH_VARARGS,
|
|
|
|
TerminateProcess_doc},
|
|
|
|
{"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS,
|
|
|
|
GetExitCodeProcess_doc},
|
|
|
|
{"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS,
|
|
|
|
WaitForSingleObject_doc},
|
|
|
|
{"GetVersion", sp_GetVersion, METH_VARARGS, GetVersion_doc},
|
|
|
|
{"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS,
|
|
|
|
GetModuleFileName_doc},
|
|
|
|
{NULL, NULL}
|
2004-10-12 12:26:28 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static void
|
|
|
|
defint(PyObject* d, const char* name, int value)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject* v = PyLong_FromLong((long) value);
|
|
|
|
if (v) {
|
|
|
|
PyDict_SetItemString(d, (char*) name, v);
|
|
|
|
Py_DECREF(v);
|
|
|
|
}
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|
|
|
|
|
2008-06-11 02:26:20 -03:00
|
|
|
static struct PyModuleDef _subprocessmodule = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyModuleDef_HEAD_INIT,
|
|
|
|
"_subprocess",
|
|
|
|
NULL,
|
|
|
|
-1,
|
|
|
|
sp_functions,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL
|
2008-06-11 02:26:20 -03:00
|
|
|
};
|
|
|
|
|
2004-10-12 12:26:28 -03:00
|
|
|
PyMODINIT_FUNC
|
2008-06-11 02:26:20 -03:00
|
|
|
PyInit__subprocess()
|
2004-10-12 12:26:28 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *d;
|
|
|
|
PyObject *m;
|
|
|
|
|
|
|
|
/* patch up object descriptors */
|
|
|
|
sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int;
|
|
|
|
if (PyType_Ready(&sp_handle_type) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
m = PyModule_Create(&_subprocessmodule);
|
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
|
|
|
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, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW);
|
|
|
|
defint(d, "SW_HIDE", SW_HIDE);
|
|
|
|
defint(d, "INFINITE", INFINITE);
|
|
|
|
defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0);
|
2011-03-14 13:02:10 -03:00
|
|
|
defint(d, "WAIT_TIMEOUT", WAIT_TIMEOUT);
|
2010-05-09 12:52:27 -03:00
|
|
|
defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE);
|
|
|
|
defint(d, "CREATE_NEW_PROCESS_GROUP", CREATE_NEW_PROCESS_GROUP);
|
|
|
|
|
|
|
|
return m;
|
2004-10-12 12:26:28 -03:00
|
|
|
}
|