Merge branch 3.2

1 files changed, 9 insertions, 0 deletions

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index efa28ea..d06f08e 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -423,6 +423,15 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol):
         value_str = value.decode(sys.getfilesystemencoding(), 'surrogateescape')
         self.assertEqual(os.environ['bytes'], value_str)
 
+    def test_unset_error(self):
+        if sys.platform == "win32":
+            # an environment variable is limited to 32,767 characters
+            key = 'x' * 50000
+        else:
+            # "=" is not allowed in a variable name
+            key = 'key='
+        self.assertRaises(OSError, os.environ.__delitem__, key)
+
 class WalkTests(unittest.TestCase):
     """Tests for os.walk()."""