closes bpo-32490: Fix filename duplication in subprocess exception message. (GH-9163)

ZackerySpytz · benjaminp · commit 73870bfeb9cf · 2018-09-11T08:54:07.000-07:00
8621bb5 sets the filename in directly in the FileNotFoundError, so we may revert the earlier fix 5f78040.
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
@@ -1512,8 +1512,6 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                         err_filename = orig_executable
                     if errno_num != 0:
                         err_msg = os.strerror(errno_num)
-                        if errno_num == errno.ENOENT:
-                            err_msg += ': ' + repr(err_filename)
                     raise child_exception_type(errno_num, err_msg, err_filename)
                 raise child_exception_type(err_msg)
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -1520,7 +1520,6 @@ def _get_chdir_exception(self):
             # string and instead capture the exception that we want to see
             # below for comparison.
             desired_exception = e
-            desired_exception.strerror += ': ' + repr(self._nonexistent_dir)
         else:
             self.fail("chdir to nonexistent directory %s succeeded." %
                       self._nonexistent_dir)
@@ -1537,6 +1536,7 @@ def test_exception_cwd(self):
             # it up to the parent process as the correct exception.
             self.assertEqual(desired_exception.errno, e.errno)
             self.assertEqual(desired_exception.strerror, e.strerror)
+            self.assertEqual(desired_exception.filename, e.filename)
         else:
             self.fail("Expected OSError: %s" % desired_exception)
 
@@ -1551,6 +1551,7 @@ def test_exception_bad_executable(self):
             # it up to the parent process as the correct exception.
             self.assertEqual(desired_exception.errno, e.errno)
             self.assertEqual(desired_exception.strerror, e.strerror)
+            self.assertEqual(desired_exception.filename, e.filename)
         else:
             self.fail("Expected OSError: %s" % desired_exception)
 
@@ -1564,6 +1565,7 @@ def test_exception_bad_args_0(self):
             # it up to the parent process as the correct exception.
             self.assertEqual(desired_exception.errno, e.errno)
             self.assertEqual(desired_exception.strerror, e.strerror)
+            self.assertEqual(desired_exception.filename, e.filename)
         else:
             self.fail("Expected OSError: %s" % desired_exception)
 
diff --git a/Misc/NEWS.d/next/Library/2018-09-11-01-25-35.bpo-32490.ROIDO1.rst b/Misc/NEWS.d/next/Library/2018-09-11-01-25-35.bpo-32490.ROIDO1.rst
@@ -0,0 +1,2 @@
+Prevent filename duplication in :mod:`subprocess` exception messages.  Patch
+by Zackery Spytz.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Prevent filename duplication in :mod:`subprocess` exception messages. Patch
	`2`	`+by Zackery Spytz.`