Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ def __str__(self):
return "Command %r died with unknown signal %d." % (
self.cmd, -self.returncode)
else:
return "Command %r returned non-zero exit status %d." % (
self.cmd, self.returncode)
return (f"Command {self.cmd!r} returned non-zero "
f"exit status {self.returncode}.")

@property
def stdout(self):
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -2449,6 +2449,10 @@ def test_CalledProcessError_str(self):
err = subprocess.CalledProcessError(-9876543, "fake cmd")
self.assertEqual(str(err), "Command 'fake cmd' died with unknown signal 9876543.")

# None return code (must not raise TypeError from __str__ itself)
err = subprocess.CalledProcessError(None, "fake cmd")
self.assertEqual(str(err), "Command 'fake cmd' returned non-zero exit status None.")

def test_preexec(self):
# DISCLAIMER: Setting environment variables is *not* a good use
# of a preexec_fn. This is merely a test.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Calling :func:`str` on a :exc:`subprocess.CalledProcessError` with a
:attr:`!returncode` of ``None`` no longer raises :exc:`TypeError`.
Loading