From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 15 May 2011 16:57:44 +0000 (+0200)
Subject: Issue #10756: atexit normalizes the exception before displaying it. Patch by
X-Git-Tag: v3.1.4rc1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0e11ec5b07c7c49061a2e4a73a0c231d9b46ad7;p=python

Issue #10756: atexit normalizes the exception before displaying it. Patch by
Andreas Stührk.

Backport a fix already applied to Python 3.2+ (4a82be47a948 + 5060a92a8597).
---

diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index 8a71036fde..9c7e109100 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -65,6 +65,14 @@ class TestCase(unittest.TestCase):
 
         self.assertRaises(TypeError, atexit._run_exitfuncs)
 
+    def test_raise_unnormalized(self):
+        # Issue #10756: Make sure that an unnormalized exception is
+        # handled properly
+        atexit.register(lambda: 1 / 0)
+
+        self.assertRaises(ZeroDivisionError, atexit._run_exitfuncs)
+        self.assertIn("ZeroDivisionError", self.stream.getvalue())
+
     def test_stress(self):
         a = [0]
         def inc():
diff --git a/Misc/NEWS b/Misc/NEWS
index c41e475cc9..521a2a0c46 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10756: atexit normalizes the exception before displaying it. Patch by
+  Andreas Stührk.
+
 - Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and
   their incremental counterparts now raise OverflowError if given an input
   larger than 4GB, instead of silently truncating the input and returning
diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c
index 1382133e0a..1ee7ead05f 100644
--- a/Modules/atexitmodule.c
+++ b/Modules/atexitmodule.c
@@ -72,6 +72,7 @@ atexit_callfuncs(void)
             PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
             if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
                 PySys_WriteStderr("Error in atexit._run_exitfuncs:\n");
+                PyErr_NormalizeException(&exc_type, &exc_value, &exc_tb);
                 PyErr_Display(exc_type, exc_value, exc_tb);
             }
         }