[Python-checkins] r70916 - in python/branches/release30-maint: Misc/ACKS Misc/NEWS Modules/_multiprocessing/win32_functions.c Python/pythonrun.c

Wed Apr 1 00:42:05 CEST 2009

Author: jesse.noller
Date: Wed Apr 1 00:42:05 2009
New Revision: 70916
Log:
Merged revisions 70913 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r70913 | jesse.noller | 2009年03月31日 17:36:44 -0500 (2009年3月31日) | 9 lines
 
 Merged revisions 70908 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r70908 | jesse.noller | 2009年03月31日 17:20:35 -0500 (2009年3月31日) | 1 line
 
 Issue 5619: Pass MS CRT debug flags into subprocesses
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Misc/ACKS
 python/branches/release30-maint/Misc/NEWS
 python/branches/release30-maint/Modules/_multiprocessing/win32_functions.c
 python/branches/release30-maint/Python/pythonrun.c
Modified: python/branches/release30-maint/Misc/ACKS
==============================================================================

--- python/branches/release30-maint/Misc/ACKS	(original)
+++ python/branches/release30-maint/Misc/ACKS	Wed Apr 1 00:42:05 2009
@@ -674,6 +674,7 @@
 Nathan Sullivan
 Mark Summerfield
 Hisao Suzuki
+Andrew Svetlov
 Kalle Svensson
 Andrew Svetlov
 Paul Swartz
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Wed Apr 1 00:42:05 2009
@@ -30,6 +30,9 @@
 Library
 -------
 
+- Issue #5619: Multiprocessing children disobey the debug flag and causes
+ popups on windows buildbots. Patch applied to work around this issue.
+
 - Issue #5387: Fixed mmap.move crash by integer overflow.
 
 - Issue #5595: Fix UnboundedLocalError in ntpath.ismount().
Modified: python/branches/release30-maint/Modules/_multiprocessing/win32_functions.c
==============================================================================
--- python/branches/release30-maint/Modules/_multiprocessing/win32_functions.c	(original)
+++ python/branches/release30-maint/Modules/_multiprocessing/win32_functions.c	Wed Apr 1 00:42:05 2009
@@ -130,6 +130,12 @@
 	if (!PyArg_ParseTuple(args, "I", &uExitCode))
 		return NULL;
 
+	#if defined(Py_DEBUG)
+		SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOALIGNMENTFAULTEXCEPT|SEM_NOGPFAULTERRORBOX|SEM_NOOPENFILEERRORBOX);
+		_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+	#endif
+
+
 	ExitProcess(uExitCode);
 
 	return NULL;
Modified: python/branches/release30-maint/Python/pythonrun.c
==============================================================================
--- python/branches/release30-maint/Python/pythonrun.c	(original)
+++ python/branches/release30-maint/Python/pythonrun.c	Wed Apr 1 00:42:05 2009
@@ -1998,6 +1998,7 @@
 Py_FatalError(const char *msg)
 {
 	fprintf(stderr, "Fatal Python error: %s\n", msg);
+	fflush(stderr); /* it helps in Windows debug build */
 	if (PyErr_Occurred()) {
 		PyErr_Print();
 	}
