[Python-checkins] cpython (merge 3.2 -> 3.2): Merge
kristjan.jonsson
python-checkins at python.org
Wed Mar 20 00:00:58 CET 2013
http://hg.python.org/cpython/rev/ec4486b5e845
changeset: 82801:ec4486b5e845
branch: 3.2
parent: 82792:2277e43fef8b
parent: 82798:bc5778b488c1
user: Kristján Valur Jónsson <sweskman at gmail.com>
date: Tue Mar 19 15:57:19 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
More information about the Python-checkins
mailing list