Merge pull request #2651 from pypa/shell-fallback-improvement

Use COMSPEC for shell detection fallback

news/2651.behavior

@@ -0,0 +1,2 @@
+Add ``COMSPEC`` to fallback option (along with ``SHELL`` and ``PYENV_SHELL``)
+if shell detection fails, improving robustness on Windows.

pipenv/environments.py

@@ -207,7 +207,11 @@
 PIPENV_SKIP_VALIDATION = True
 
 # Internal, the default shell to use if shell detection fails.
-PIPENV_SHELL = os.environ.get("SHELL") or os.environ.get("PYENV_SHELL")
+PIPENV_SHELL = (
+    os.environ.get("SHELL") or
+    os.environ.get("PYENV_SHELL") or
+    os.environ.get("COMSPEC")
+)
 
 # Internal, to tell whether the command line session is interactive.
 SESSION_IS_INTERACTIVE = bool(os.isatty(sys.stdout.fileno()))

pipenv/shells.py

@@ -29,19 +29,19 @@ def detect_info():
     raise ShellDetectionFailure
 
 
-def _get_activate_script(venv):
+def _get_activate_script(cmd, venv):
     """Returns the string to activate a virtualenv.
 
     This is POSIX-only at the moment since the compat (pexpect-based) shell
     does not work elsewhere anyway.
     """
     # Suffix and source command for other shells.
     # Support for fish shell.
-    if PIPENV_SHELL and "fish" in PIPENV_SHELL:
+    if "fish" in cmd:
         suffix = ".fish"
         command = "source"
     # Support for csh shell.
-    elif PIPENV_SHELL and "csh" in PIPENV_SHELL:
+    elif "csh" in cmd:
         suffix = ".csh"
         command = "source"
     else:
@@ -104,7 +104,7 @@ def fork_compat(self, venv, cwd, args):
         dims = get_terminal_size()
         with temp_environ():
             c = pexpect.spawn(self.cmd, ["-i"], dimensions=(dims.lines, dims.columns))
-        c.sendline(_get_activate_script(venv))
+        c.sendline(_get_activate_script(self.cmd, venv))
         if args:
             c.sendline(" ".join(args))