Some day I'll learn to listen to people

topazproject · Jun 22, 2013 · ac3b3ff · ac3b3ff
1 parent cf667d2
commit ac3b3ff
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/topaz/objects/envobject.py b/topaz/objects/envobject.py
@@ -37,14 +37,14 @@ def method_subscript(self, space, key):
     def method_subscript_assign(self, space, key, w_value):
         if "\0" in key:
             raise space.error(space.w_ArgumentError, "bad environment variable name")
-        if "=" in key or key == "":
-            raise error_for_errno(space, errno.EINVAL)
         if w_value is space.w_nil:
             try:
                 del os.environ[key]
-            except KeyError:
+            except (KeyError, OSError):
                 pass
             return space.w_nil
+        if "=" in key or key == "":
+            raise error_for_errno(space, errno.EINVAL)
         value = Coerce.str(space, w_value)
         if "\0" in value:
             raise space.error(space.w_ArgumentError, "bad environment variable value")