From 3583761bcd3ebc85207f555017e06f2007cd0db0 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 19 Apr 2013 12:56:57 -0400
Subject: #17413: make sure settrace funcs get passed exception instances for
 'value'.

Patch by Ingrid Cheung and Brendan McLoughlin.
---
 Lib/test/test_sys_settrace.py | 23 +++++++++++++++++++++++
 Misc/ACKS                     |  2 ++
 Misc/NEWS                     |  4 ++++
 Python/ceval.c                |  1 +
 4 files changed, 30 insertions(+)

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 63ae1b7..f0b0b82 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -458,6 +458,29 @@ class RaisingTraceFuncTestCase(unittest.TestCase):
             self.fail("exception not propagated")
 
 
+    def test_exception_arguments(self):
+        def f():
+            x = 0
+            # this should raise an error
+            x.no_such_attr
+        def g(frame, event, arg):
+            if (event == 'exception'):
+                type, exception, trace = arg
+                self.assertIsInstance(exception, Exception)
+            return g
+
+        existing = sys.gettrace()
+        try:
+            sys.settrace(g)
+            try:
+                f()
+            except AttributeError:
+                # this is expected
+                pass
+        finally:
+            sys.settrace(existing)
+
+
 # 'Jump' tests: assigning to frame.f_lineno within a trace function
 # moves the execution position - it's how debuggers implement a Jump
 # command (aka. "Set next statement").
diff --git a/Misc/ACKS b/Misc/ACKS
index a7837a4..fe27994 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -208,6 +208,7 @@ David Chaum
 Nicolas Chauvat
 Jerry Chen
 Michael Chermside
+Ingrid Cheung
 Albert Chin-A-Young
 Adal Chiriliuc
 Matt Chisholm
@@ -786,6 +787,7 @@ Chris McDonough
 Greg McFarlane
 Alan McIntyre
 Michael McLay
+Brendan McLoughlin
 Mark Mc Mahon
 Gordon McMillan
 Andrew McNamara
diff --git a/Misc/NEWS b/Misc/NEWS
index a67ce0b..dde410f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.3.2?
 Core and Builtins
 -----------------
 
+- Issue #17413: sys.settrace callbacks were being passed a string instead of an
+  exception instance for the 'value' element of the arg tuple if the exception
+  originated from C code; now an exception instance is always provided.
+
 - Issue #17782: Fix undefined behaviour on platforms where
   ``struct timespec``'s "tv_nsec" member is not a C long.
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 82bfcc6..f427841 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3712,6 +3712,7 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
         value = Py_None;
         Py_INCREF(value);
     }
+    PyErr_NormalizeException(&type, &value, &traceback);
     arg = PyTuple_Pack(3, type, value, traceback);
     if (arg == NULL) {
         PyErr_Restore(type, value, traceback);
-- 
cgit v0.12