Merged revisions 78339 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78339 | jack.diederich | 2010-02-22 16:27:38 -0500 (Mon, 22 Feb 2010) | 1 line
* fix issue#7476
........
diff --git a/Lib/pipes.py b/Lib/pipes.py
index 6dcc997..25e9915 100644
--- a/Lib/pipes.py
+++ b/Lib/pipes.py
@@ -267,10 +267,13 @@
_funnychars = '"`$\\' # Unsafe inside "double quotes"
def quote(file):
+ ''' return a shell-escaped version of the file string '''
for c in file:
if c not in _safechars:
break
else:
+ if not file:
+ return "''"
return file
if '\'' not in file:
return '\'' + file + '\''
diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py
index 0eca8ed..dd1cc9e 100644
--- a/Lib/test/test_pipes.py
+++ b/Lib/test/test_pipes.py
@@ -74,6 +74,8 @@
self.assertEqual(pipes.quote("test%s'name'" % u),
'"test\\%s\'name\'"' % u)
+ self.assertEqual(pipes.quote(''), "''")
+
def testRepr(self):
t = pipes.Template()
self.assertEqual(repr(t), "<Template instance, steps=[]>")
diff --git a/Misc/ACKS b/Misc/ACKS
index 1d2daac..31edd74 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -778,6 +778,7 @@
Blake Winton
Jean-Claude Wippler
Lars Wirzenius
+John Wiseman
Chris Withers
Stefan Witzel
David Wolever