gh-119670: Add 'always' keyword argument to shlex.quote

Doc/library/shlex.rst

@@ -49,11 +49,13 @@ The :mod:`shlex` module defines the following functions:
    .. versionadded:: 3.8
 
 
-.. function:: quote(s)
+.. function:: quote(s, always=False)
 
    Return a shell-escaped version of the string *s*.  The returned value is a
    string that can safely be used as one token in a shell command line, for
-   cases where you cannot use a list.
+   cases where you cannot use a list. If the *always* keyword argument is
+   set to ``True`` then the string *s* will always be escaped, even in the
+   absence of special characters.
 
    .. _shlex-quote-warning:
 
@@ -98,6 +100,9 @@ The :mod:`shlex` module defines the following functions:
 
    .. versionadded:: 3.3
 
+   .. versionchanged:: 3.14
+      Added the *always* parameter.
+
 The :mod:`shlex` module defines the following class:
 
 

Lib/shlex.py

@@ -320,17 +320,14 @@ def join(split_command):
 
 _find_unsafe = re.compile(r'[^\w@%+=:,./-]', re.ASCII).search
 
-def quote(s):
+def quote(s, always=False):
     """Return a shell-escaped version of the string *s*."""
-    if not s:
-        return "''"
-    if _find_unsafe(s) is None:
-        return s
-
-    # use single quotes, and put single quotes into double quotes
-    # the string $'b is then quoted as '$'"'"'b'
-    return "'" + s.replace("'", "'\"'\"'") + "'"
+    if always or not s or _find_unsafe(s) is not None:
+        # use single quotes, and put single quotes into double quotes
+        # the string $'b is then quoted as '$'"'"'b'
+        return "'" + s.replace("'", "'\"'\"'") + "'"
 
+    return s
 
 def _print_tokens(lexer):
     while tt := lexer.get_token():

Misc/NEWS.d/next/Library/2024-05-28-17-24-19.gh-issue-119670.P4J3vX.rst

@@ -0,0 +1,2 @@
+:func:`shlex.quote` now has an *always* keyword argument for forcing
+the escaping of the string passed to it