Merge pull request #2385 from pypa/avoid-shell-in-run-if-possible

Use shell=False when "run" if possible on Windows
pypa · Jun 22, 2018 · fde4a89 · fde4a89
2 parents 82bf57a + 1091ccb
commit fde4a89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/news/2385.feature b/news/2385.feature
@@ -0,0 +1 @@
+``pipenv run`` will now avoid spawning additional ``COMSPEC`` instances to run commands in when possible.``
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -2272,7 +2272,12 @@ def inline_activate_virtualenv():
 
 def do_run_nt(script):
     import subprocess
-    p = subprocess.Popen(script.cmdify(), shell=True, universal_newlines=True)
+    command = system_which(script.command)
+    options = {'universal_newlines': True}
+    if command:     # Try to use CreateProcess directly if possible.
+        p = subprocess.Popen([command] + script.args, **options)
+    else:   # Command not found, maybe this is a shell built-in?
+        p = subprocess.Popen(script.cmdify(), shell=True, **options)
     p.communicate()
     sys.exit(p.returncode)