Fix issue 1300: Quote command line arguments that contain a '|' character in
subprocess.list2cmdline (windows).
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index bae4259..975a924 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -471,8 +471,8 @@
2) A string surrounded by double quotation marks is
interpreted as a single argument, regardless of white space
- contained within. A quoted string can be embedded in an
- argument.
+ or pipe characters contained within. A quoted string can be
+ embedded in an argument.
3) A double quotation mark preceded by a backslash is
interpreted as a literal double quotation mark.
@@ -498,7 +498,7 @@
if result:
result.append(' ')
- needquote = (" " in arg) or ("\t" in arg) or not arg
+ needquote = (" " in arg) or ("\t" in arg) or ("|" in arg) or not arg
if needquote:
result.append('"')
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index a7e309e..9886f3d 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -434,6 +434,8 @@
'"a\\\\b\\ c" d e')
self.assertEqual(subprocess.list2cmdline(['ab', '']),
'ab ""')
+ self.assertEqual(subprocess.list2cmdline(['echo', 'foo|bar']),
+ 'echo "foo|bar"')
def test_poll(self):