mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00: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 ........
This commit is contained in:
Georg Brandl
parent
4f6f34fb0b
commit
3dbca81c9b
35 changed files with 305 additions and 210 deletions
|
|
@ -66,6 +66,14 @@ sp_handle_new(HANDLE handle)
|
|||
return (PyObject*) self;
|
||||
}
|
||||
|
||||
#if defined(MS_WIN32) && !defined(MS_WIN64)
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLong((long) handle)
|
||||
#define PY_HANDLE_PARAM "l"
|
||||
#else
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLongLong((long long) handle)
|
||||
#define PY_HANDLE_PARAM "L"
|
||||
#endif
|
||||
|
||||
static PyObject*
|
||||
sp_handle_detach(sp_handle_object* self, PyObject* args)
|
||||
{
|
||||
|
|
@ -79,7 +87,7 @@ sp_handle_detach(sp_handle_object* self, PyObject* args)
|
|||
self->handle = NULL;
|
||||
|
||||
/* note: return the current handle, as an integer */
|
||||
return PyLong_FromLong((long) handle);
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
|
|
@ -113,7 +121,7 @@ static PyMethodDef sp_handle_methods[] = {
|
|||
static PyObject*
|
||||
sp_handle_as_int(sp_handle_object* self)
|
||||
{
|
||||
return PyLong_FromLong((long) self->handle);
|
||||
return HANDLE_TO_PYNUM(self->handle);
|
||||
}
|
||||
|
||||
static PyNumberMethods sp_handle_as_number;
|
||||
|
|
@ -172,7 +180,7 @@ sp_GetStdHandle(PyObject* self, PyObject* args)
|
|||
}
|
||||
|
||||
/* note: returns integer, not handle object */
|
||||
return PyLong_FromLong((long) handle);
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -190,14 +198,16 @@ sp_DuplicateHandle(PyObject* self, PyObject* args)
|
|||
HANDLE target_handle;
|
||||
BOOL result;
|
||||
|
||||
long source_process_handle;
|
||||
long source_handle;
|
||||
long target_process_handle;
|
||||
HANDLE source_process_handle;
|
||||
HANDLE source_handle;
|
||||
HANDLE target_process_handle;
|
||||
int desired_access;
|
||||
int inherit_handle;
|
||||
int options = 0;
|
||||
|
||||
if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle",
|
||||
if (! PyArg_ParseTuple(args,
|
||||
PY_HANDLE_PARAM PY_HANDLE_PARAM PY_HANDLE_PARAM
|
||||
"ii|i:DuplicateHandle",
|
||||
&source_process_handle,
|
||||
&source_handle,
|
||||
&target_process_handle,
|
||||
|
|
@ -208,9 +218,9 @@ sp_DuplicateHandle(PyObject* self, PyObject* args)
|
|||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = DuplicateHandle(
|
||||
(HANDLE) source_process_handle,
|
||||
(HANDLE) source_handle,
|
||||
(HANDLE) target_process_handle,
|
||||
source_process_handle,
|
||||
source_handle,
|
||||
target_process_handle,
|
||||
&target_handle,
|
||||
desired_access,
|
||||
inherit_handle,
|
||||
|
|
@ -440,13 +450,13 @@ sp_TerminateProcess(PyObject* self, PyObject* args)
|
|||
{
|
||||
BOOL result;
|
||||
|
||||
long process;
|
||||
HANDLE process;
|
||||
int exit_code;
|
||||
if (! PyArg_ParseTuple(args, "li:TerminateProcess", &process,
|
||||
&exit_code))
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:TerminateProcess",
|
||||
&process, &exit_code))
|
||||
return NULL;
|
||||
|
||||
result = TerminateProcess((HANDLE) process, exit_code);
|
||||
result = TerminateProcess(process, exit_code);
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
|
@ -461,11 +471,11 @@ sp_GetExitCodeProcess(PyObject* self, PyObject* args)
|
|||
DWORD exit_code;
|
||||
BOOL result;
|
||||
|
||||
long process;
|
||||
if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process))
|
||||
HANDLE process;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetExitCodeProcess", &process))
|
||||
return NULL;
|
||||
|
||||
result = GetExitCodeProcess((HANDLE) process, &exit_code);
|
||||
result = GetExitCodeProcess(process, &exit_code);
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
|
@ -478,15 +488,15 @@ sp_WaitForSingleObject(PyObject* self, PyObject* args)
|
|||
{
|
||||
DWORD result;
|
||||
|
||||
long handle;
|
||||
HANDLE handle;
|
||||
int milliseconds;
|
||||
if (! PyArg_ParseTuple(args, "li:WaitForSingleObject",
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:WaitForSingleObject",
|
||||
&handle,
|
||||
&milliseconds))
|
||||
return NULL;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds);
|
||||
result = WaitForSingleObject(handle, (DWORD) milliseconds);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (result == WAIT_FAILED)
|
||||
|
|
@ -508,13 +518,14 @@ static PyObject *
|
|||
sp_GetModuleFileName(PyObject* self, PyObject* args)
|
||||
{
|
||||
BOOL result;
|
||||
long module;
|
||||
HMODULE module;
|
||||
WCHAR filename[MAX_PATH];
|
||||
|
||||
if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module))
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetModuleFileName",
|
||||
&module))
|
||||
return NULL;
|
||||
|
||||
result = GetModuleFileNameW((HMODULE)module, filename, MAX_PATH);
|
||||
result = GetModuleFileNameW(module, filename, MAX_PATH);
|
||||
filename[MAX_PATH-1] = '\0';
|
||||
|
||||
if (! result)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue