[Python-checkins] cpython (merge 3.3 -> 3.3): Merge

Wed Mar 20 00:01:00 CET 2013

http://hg.python.org/cpython/rev/c34b580338d8
changeset: 82802:c34b580338d8
branch: 3.3
parent: 82794:7127dda7e8ed
parent: 82799:4c7eb717ea88
user: Kristján Valur Jónsson <sweskman at gmail.com>
date: Tue Mar 19 16:00:01 2013 -0700
summary:
 Merge
files:
 Modules/_ctypes/callproc.c | 5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -397,6 +397,11 @@
 {
 *pdw = ptrs->ExceptionRecord->ExceptionCode;
 *record = *ptrs->ExceptionRecord;
+ /* We don't want to catch breakpoint exceptions, they are used to attach
+ * a debugger to the process.
+ */
+ if (*pdw == EXCEPTION_BREAKPOINT)
+ return EXCEPTION_CONTINUE_SEARCH;
 return EXCEPTION_EXECUTE_HANDLER;
 }
 #endif
-- 
Repository URL: http://hg.python.org/cpython
