diff Lib/subprocess.py @ 62402:ef8a2ab26e9f

Merged revisions 82075 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82075 | jean-paul.calderone | 2010-06-18 16:00:17 -0400 (Fri, 18 Jun 2010) | 12 lines 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. ........
author Jean-Paul Calderone <exarkun@divmod.com>
date Fri, 18 Jun 2010 20:03:54 +0000
parents 441491572fce
children aa0b56dd14af
line wrap: on
line diff
--- a/Lib/subprocess.py	Fri Jun 18 18:44:37 2010 +0000
+++ b/Lib/subprocess.py	Fri Jun 18 20:03:54 2010 +0000
@@ -500,8 +500,8 @@
 
     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.
@@ -529,7 +529,7 @@
         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('"')