Bug fix: Allow assignment of individual environment variables

executor/__init__.py

@@ -3,7 +3,7 @@
 # Programmer friendly subprocess wrapper.
 #
 # Author: Peter Odding <peter@peterodding.com>
-# Last Change: June 3, 2016
+# Last Change: July 9, 2016
 # URL: https://executor.readthedocs.org
 
 """
@@ -68,7 +68,7 @@
     unicode = str
 
 # Semi-standard module versioning.
-__version__ = '11.0'
+__version__ = '11.0.1'
 
 # Initialize a logger.
 logger = logging.getLogger(__name__)
@@ -503,7 +503,7 @@ def encoding(self):
         """
         return DEFAULT_ENCODING
 
-    @mutable_property
+    @writable_property(cached=True)
     def environment(self):
         """
         A dictionary of environment variables for the external command.

executor/tests.py

@@ -1,7 +1,7 @@
 # Automated tests for the `executor' module.
 #
 # Author: Peter Odding <peter@peterodding.com>
-# Last Change: June 3, 2016
+# Last Change: July 9, 2016
 # URL: https://executor.readthedocs.org
 
 """
@@ -425,13 +425,24 @@ def test_sudo_option(self):
     def test_environment_variable_handling(self):
         """Make sure environment variables can be overridden."""
         # Check that environment variables of the current process are passed on to subprocesses.
-        self.assertEqual(execute('echo $PATH', capture=True), os.environ['PATH'])
+        output = execute('echo $PATH', capture=True)
+        assert output == os.environ['PATH']
         # Test that environment variable overrides can be given to external commands.
-        override_value = str(random.random())
-        self.assertEqual(execute('echo $override',
-                                 capture=True,
-                                 environment=dict(override=override_value)),
-                         override_value)
+        output = execute(
+            'echo $HELLO $WORLD',
+            capture=True,
+            environment=dict(
+                HELLO='Hello',
+                WORLD='world!',
+            ),
+        )
+        assert output == 'Hello world!'
+        # Test that the environment variables of a command can be modified
+        # after the command has been initialized.
+        cmd = ExternalCommand('echo $DELAYED', capture=True)
+        cmd.environment['DELAYED'] = 'Also works fine'
+        cmd.wait()
+        assert cmd.output == 'Also works fine'
 
     def test_simple_async_cmd(self):
         """Make sure commands can be executed asynchronously."""