Extend environment for processes, don't replace it

peritus · Feb 14, 2014 · aa89889 · aa89889
1 parent 7ddb36f
commit aa89889
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bumpversion/__init__.py b/bumpversion/__init__.py
@@ -60,7 +60,9 @@ def commit(cls, message):
         f = NamedTemporaryFile('wb', delete=False)
         f.write(message.encode('utf-8'))
         f.close()
-        subprocess.check_output(cls._COMMIT_COMMAND + [f.name], env={'HGENCODING': 'utf-8'})
+        subprocess.check_output(cls._COMMIT_COMMAND + [f.name], env=dict(
+            list(os.environ.items()) + [('HGENCODING', 'utf-8')]
+        ))
         os.unlink(f.name)
 
     @classmethod

diff --git a/tests.py b/tests.py
@@ -17,9 +17,13 @@
 
 from bumpversion import main, DESCRIPTION
 
-call = partial(subprocess.call, env={'HGENCODING': 'utf-8'})
-check_call = partial(subprocess.check_call, env={'HGENCODING': 'utf-8'})
-check_output = partial(subprocess.check_output, env={'HGENCODING': 'utf-8'})
+SUBPROCESS_ENV = dict(
+    list(environ.items()) + [('HGENCODING', 'utf-8')]
+)
+
+call = partial(subprocess.call, env=SUBPROCESS_ENV)
+check_call = partial(subprocess.check_call, env=SUBPROCESS_ENV)
+check_output = partial(subprocess.check_output,  env=SUBPROCESS_ENV)
 
 xfail_if_no_git = pytest.mark.xfail(
   call(["git", "--help"], shell=True) != 1,