Merge pull request #31 from bretthoerner/fix-env

Fix env argument. Dicts are mutable and update returns None.
not-kennethreitz · May 9, 2012 · 1608164 · 1608164
2 parents f262532 + e795586
commit 1608164
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/envoy/core.py b/envoy/core.py
@@ -29,7 +29,8 @@ def __init__(self, cmd):
 
     def run(self, data, timeout, kill_timeout, env):
         self.data = data
-        environ = dict(os.environ).update(env or {})
+        environ = dict(os.environ)
+        environ.update(env or {})
 
         def target():
 
@@ -194,7 +195,8 @@ def connect(command, data=None, env=None):
 
     # TODO: support piped commands
     command_str = expand_args(command).pop()
-    environ = dict(os.environ).update(env or {})
+    environ = dict(os.environ)
+    environ.update(env or {})
 
     process = subprocess.Popen(command_str,
         universal_newlines=True,