Close #17702: On error, os.environb now removes suppress the except context
when raising a new KeyError with the original key.
diff --git a/Lib/os.py b/Lib/os.py
index 06616c6..87689cc 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -673,7 +673,7 @@
value = self._data[self.encodekey(key)]
except KeyError:
# raise KeyError with the original key value
- raise KeyError(key)
+ raise KeyError(key) from None
return self.decodevalue(value)
def __setitem__(self, key, value):
@@ -689,7 +689,7 @@
del self._data[encodedkey]
except KeyError:
# raise KeyError with the original key value
- raise KeyError(key)
+ raise KeyError(key) from None
def __iter__(self):
for key in self._data:
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 2db030e..fbf6c0c 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -644,10 +644,13 @@
with self.assertRaises(KeyError) as cm:
os.environ[missing]
self.assertIs(cm.exception.args[0], missing)
+ self.assertTrue(cm.exception.__suppress_context__)
with self.assertRaises(KeyError) as cm:
del os.environ[missing]
self.assertIs(cm.exception.args[0], missing)
+ self.assertTrue(cm.exception.__suppress_context__)
+
class WalkTests(unittest.TestCase):
"""Tests for os.walk()."""
diff --git a/Misc/NEWS b/Misc/NEWS
index bfb2fd8..81ad8f5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@
Library
-------
+- Issue #17702: On error, os.environb now removes suppress the except context
+ when raising a new KeyError with the original key.
+
- Issue #18755: Fixed the loader used in imp to allow get_data() to be called
multiple times.