(Merge 3.3) Issue #17702: use assertRaises() for the unit test

1 files changed, 4 insertions, 10 deletions

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e6aae5c6ef..3a38285b57 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -636,19 +636,13 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol):
         missing = 'missingkey'
         self.assertNotIn(missing, os.environ)
 
-        try:
+        with self.assertRaises(KeyError) as cm:
             os.environ[missing]
-        except KeyError as err:
-            self.assertIs(err.args[0], missing)
-        else:
-            self.fail("KeyError not raised")
+        self.assertIs(cm.exception.args[0], missing)
 
-        try:
+        with self.assertRaises(KeyError) as cm:
             del os.environ[missing]
-        except KeyError as err:
-            self.assertIs(err.args[0], missing)
-        else:
-            self.fail("KeyError not raised")
+        self.assertIs(cm.exception.args[0], missing)
 
 class WalkTests(unittest.TestCase):
     """Tests for os.walk()."""