Fix Windows failure (#2056)

pypa · Jan 19, 2021 · a9b0f3b · a9b0f3b
1 parent 40aec48
commit a9b0f3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/virtualenv/util/subprocess/_win_subprocess.py b/src/virtualenv/util/subprocess/_win_subprocess.py
@@ -155,6 +155,7 @@ def _execute_child(
                 args = args.decode('utf-8')
         startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
         startupinfo.wShowWindow = _subprocess.SW_HIDE
+        env = os.environ if env is None else env
         comspec = env.get("COMSPEC", unicode("cmd.exe"))
         if (
             _subprocess.GetVersion() >= 0x80000000 or

diff --git a/tests/unit/config/test___main__.py b/tests/unit/config/test___main__.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-import os
 import re
 import sys
 
@@ -91,8 +90,9 @@ def test_session_report_subprocess(session_app_data, tmp_path):
     # when called via a subprocess the logging framework should flush and POSIX line normalization happen
     out = subprocess.check_output(
         [sys.executable, "-m", "virtualenv", str(tmp_path), "--activators", "powershell", "--without-pip"],
+        universal_newlines=True,
     )
-    lines = out.decode().split(os.linesep)
+    lines = out.split("\n")
     regexes = [
         r"created virtual environment .* in \d+ms",
         r"  creator .*",