From e9a6a7dd4c19d2630ff1d24ce6d9f30879138e81 Mon Sep 17 00:00:00 2001
From: Stefan Krah <stefan@bytereef.org>
Date: Mon, 19 Jul 2010 14:41:08 +0000
Subject: [PATCH] Issue #9265: Incorrect name passed as arg[0] when shell=True
 and executable specified.

---
 Lib/subprocess.py           |  2 ++
 Lib/test/test_subprocess.py | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index bdd116a103a..3cd8e908f1b 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1091,6 +1091,8 @@ class Popen(object):
 
             if shell:
                 args = ["/bin/sh", "-c"] + args
+                if executable:
+                    args[0] = executable
 
             if executable is None:
                 executable = args[0]
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index b3e3e4174f8..f471c7bd86e 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -641,6 +641,25 @@ class POSIXProcessTestCase(BaseTestCase):
         os.remove(fname)
         self.assertEqual(rc, 47)
 
+    def test_specific_shell(self):
+        # Issue #9265: Incorrect name passed as arg[0].
+        shells = []
+        for prefix in ['/bin', '/usr/bin/', '/usr/local/bin']:
+            for name in ['bash', 'ksh']:
+                sh = os.path.join(prefix, name)
+                if os.path.isfile(sh):
+                    shells.append(sh)
+        if not shells: # Will probably work for any shell but csh.
+            self.skipTest("bash or ksh required for this test")
+        sh = '/bin/sh'
+        if os.path.isfile(sh) and not os.path.islink(sh):
+            # Test will fail if /bin/sh is a symlink to csh.
+            shells.append(sh)
+        for sh in shells:
+            p = subprocess.Popen("echo $0", executable=sh, shell=True,
+                                 stdout=subprocess.PIPE)
+            self.assertEqual(p.stdout.read().strip(), sh)
+
     def _kill_process(self, method, *args):
         # Do not inherit file handles from the parent.
         # It should fix failures on some platforms.