Skip to content

gh-138804: Check type in shlex.quote #138809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 12, 2025
Merged

gh-138804: Check type in shlex.quote #138809

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e0164
gh-138804: Check type in `shlex.quote`
wiomoc Sep 11, 2025
bd6a959
post review
wiomoc Sep 11, 2025
13d95f0
wording & move type-check post empty check
wiomoc Sep 12, 2025
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
3 changes: 3 additions & 0 deletions Lib/shlex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@ def join(split_command):

def quote(s):
"""Return a shell-escaped version of the string *s*."""
if not isinstance(s, str):
raise TypeError(f"expected string object, got {type(s).__name__!r}")

if not s:
return "''"

Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_shlex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ def testQuote(self):
for u in unsafe:
self.assertEqual(shlex.quote("test%s'name'" % u),
"'test%s'\"'\"'name'\"'\"''" % u)
self.assertRaises(TypeError, shlex.quote, 42)
self.assertRaises(TypeError, shlex.quote, b"abc")

def testJoin(self):
for split_command, command in [
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2025-09-12-01-01-05.gh-issue-138804.46ZukT.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Raise :exc:`TypeError` instead of :exc:`AttributeError` when an argument of
incorrect type is passed to :func:`shlex.quote`. This restores the behavior of
that function pre-3.14.
Loading