Merge pull request topazproject#521 from michelboaventura/env_delete

Implements ENV#delete
chrblabla · Mar 18, 2013 · 1378fb3 · 1378fb3
2 parents 9b39c7d + b85adea
commit 1378fb3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/spec/tags/core/env/delete_tags.txt b/spec/tags/core/env/delete_tags.txt
diff --git a/topaz/objects/envobject.py b/topaz/objects/envobject.py
@@ -33,3 +33,16 @@ def method_subscript_assign(self, space, key, value):
             raise space.error(space.w_ArgumentError, "bad environment variable value")
         os.environ[key] = value
         return space.newstr_fromstr(value)
+
+    @classdef.method("delete", key="str")
+    def method_delete(self, space, key, block=None):
+        if "\0" in key:
+            raise space.error(space.w_ArgumentError, "bad environment variable name")
+        try:
+            val = os.environ[key]
+        except KeyError:
+            if block is not None:
+                space.invoke_block(block, [space.newstr_fromstr(key)])
+            return space.w_nil
+        del os.environ[key]
+        return space.newstr_fromstr(val)