From e7955868b97303c1dc4fbedefeea543422cfdc11 Mon Sep 17 00:00:00 2001 From: Brett Hoerner Date: Wed, 9 May 2012 10:49:33 -0500 Subject: [PATCH] Fix env argument. Dicts are mutable and update returns None. --- envoy/core.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/envoy/core.py b/envoy/core.py index 4100589..665289f 100644 --- a/envoy/core.py +++ b/envoy/core.py @@ -29,7 +29,8 @@ class Command(object): 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,