From b33f0c1ccdab9a774a644ff928c3663685d6fd20 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 18 Jun 2010 20:00:17 +0000 Subject: [PATCH] Revert r60115 This revision introduced quoting for strings containing | based on a misunderstanding of the commonly used quoting rules used on Windows. | is interpreted by cmd.exe, not by the MS C runtime argv initializer. It only needs to be quoted if it is part of an argument passed through cmd.exe. See issue1300, issue7839, and issue8972. --- Lib/subprocess.py | 6 +++--- Lib/test/test_subprocess.py | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 115d07daf1..bdd116a103 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -548,8 +548,8 @@ def list2cmdline(seq): 2) A string surrounded by double quotation marks is interpreted as a single argument, regardless of white space - or pipe characters contained within. A quoted string can be - embedded in an argument. + 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. @@ -577,7 +577,7 @@ def list2cmdline(seq): if result: result.append(' ') - needquote = (" " in arg) or ("\t" in arg) or ("|" in arg) or not arg + needquote = (" " in arg) or ("\t" in arg) or not arg if needquote: result.append('"') diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index a858c402ed..b3e3e4174f 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -486,8 +486,6 @@ class ProcessTestCase(BaseTestCase): '"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): -- 2.40.0