Changeset 603 for python

Timestamp:

Dec 11, 2015, 1:26:45 AM (10 years ago)

Author:

dmik

Message:

python: Use configured SHELL in subprocess module.

Use the shell that was configured when building python whe
supbropcess.Popen(shell=True) is requested instead of the
hardcoded '/bin/sh' value which might be not there.

Closes #141.

Location:

python/trunk/Lib

Files:

• popen2.py (modified) (2 diffs)
• subprocess.py (modified) (2 diffs)

python/trunk/Lib/popen2.py

@@ -12 +12 @@
 warnings.warn("The popen2 module is deprecated.  Use the subprocess module.",
               DeprecationWarning, stacklevel=2)
+
+import sysconfig
+SHELL = sysconfig.get_config_var('SHELL') or '/bin/sh'
 
 __all__ = ["popen2", "popen3", "popen4"]
@@ -82 +85 @@
     def _run_child(self, cmd):
         if isinstance(cmd, basestring):
-            cmd = ['/bin/sh', '-c', cmd]
+            cmd = [SHELL, '-c', cmd]
         os.closerange(3, MAXFD)
         try:

python/trunk/Lib/subprocess.py

@@ -396 +396 @@
 import signal
 import errno
+
+import sysconfig
+SHELL = sysconfig.get_config_var('SHELL') or '/bin/sh'
 
 # Exception classes used by this module.
@@ -1198 +1201 @@
 
             if shell:
-                args = ["/bin/sh", "-c"] + args
+                args = [SHELL, "-c"] + args
                 if executable:
                     args[0] = executable