From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 22 Jan 2022 07:37:32 +0000 (-0800)
Subject: bpo-46442: improve and rename testExceptionCleanupNames (GH-30758)
X-Git-Tag: v3.9.11~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e064af564c8580285a76199229864ddfb1e50c0f;p=thirdparty%2FPython%2Fcpython.git

bpo-46442: improve and rename testExceptionCleanupNames (GH-30758)


The test tested that explicitly deleting the local variable bound to the exception
did not cause problems, but it did not test what it actually claimed to test, i.e.
that the variable is deleted automatically.
(cherry picked from commit 82c53229e18f5853c82cb8ab6b9af1925a0e9e58)

Co-authored-by: Yellow Dusk <yellow.dusk1590@fastmail.com>
---

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 5168b0b8a083..90d7f37dd867 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -598,15 +598,27 @@ class ExceptionTests(unittest.TestCase):
         self.assertTrue(str(Exception('a')))
         self.assertTrue(str(Exception('a', 'b')))
 
-    def testExceptionCleanupNames(self):
+    def test_exception_cleanup_names(self):
         # Make sure the local variable bound to the exception instance by
         # an "except" statement is only visible inside the except block.
         try:
             raise Exception()
         except Exception as e:
-            self.assertTrue(e)
+            self.assertIsInstance(e, Exception)
+        self.assertNotIn('e', locals())
+        with self.assertRaises(UnboundLocalError):
+            e
+
+    def test_exception_cleanup_names2(self):
+        # Make sure the cleanup doesn't break if the variable is explicitly deleted.
+        try:
+            raise Exception()
+        except Exception as e:
+            self.assertIsInstance(e, Exception)
             del e
         self.assertNotIn('e', locals())
+        with self.assertRaises(UnboundLocalError):
+            e
 
     def testExceptionCleanupState(self):
         # Make sure exception state is cleaned up as soon as the except