From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Aug 2008 20:19:17 +0000 (+0000)
Subject: add NEWS note and test for last commit
X-Git-Tag: v3.0rc1~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc74e5be1a7c1647e87218c8548fa50163cbf781;p=python

add NEWS note and test for last commit
---

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 04288d9fd6..2b9a5d5bce 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -62,6 +62,12 @@ class SysModuleTest(unittest.TestCase):
 
         self.assert_(err.getvalue().endswith("ValueError: 42\n"))
 
+    def test_excepthook(self):
+        with test.support.captured_output("stderr") as stderr:
+            sys.excepthook(1, '1', 1)
+        self.assert_("TypeError: print_exception(): Exception expected for " \
+                         "value, str found" in stderr.getvalue())
+
     # FIXME: testing the code for a lost or replaced excepthook in
     # Python/pythonrun.c::PyErr_PrintEx() is tricky.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index dd91623af0..83f1c96149 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,9 @@ What's new in Python 3.0b3?
 Core and Builtins
 -----------------
 
+- Issue #3653: Fix a segfault when sys.excepthook was called with invalid
+  arguments.
+
 - Issue #2394: implement more of the memoryview API, with the caveat that
   only one-dimensional contiguous buffers are supported and exercised right
   now. Slicing, slice assignment and comparison (equality and inequality)