- Changed shlex.split() method to have more useful and
meaningful parameters.
diff --git a/Lib/shlex.py b/Lib/shlex.py
index dd10447..b302699 100644
--- a/Lib/shlex.py
+++ b/Lib/shlex.py
@@ -271,9 +271,11 @@
raise StopIteration
return token
-def split(s, posix=True, spaces=True):
- lex = shlex(s, posix=posix)
- lex.whitespace_split = spaces
+def split(s, comments=False):
+ lex = shlex(s, posix=True)
+ lex.whitespace_split = True
+ if not comments:
+ lex.commenters = ''
return list(lex)
if __name__ == '__main__':
diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py
index ed0ab47..1678c7d 100644
--- a/Lib/test/test_shlex.py
+++ b/Lib/test/test_shlex.py
@@ -151,9 +151,9 @@
for item in self.posix_data:
item[0] = item[0].replace(r"\n", "\n")
- def splitTest(self, data, posix, spaces):
+ def splitTest(self, data, comments):
for i in range(len(data)):
- l = shlex.split(data[i][0], posix=posix, spaces=spaces)
+ l = shlex.split(data[i][0], comments=comments)
self.assertEqual(l, data[i][1:],
"%s: %s != %s" %
(data[i][0], l, data[i][1:]))
@@ -167,13 +167,9 @@
tok = lex.get_token()
return ret
- def testSplit(self):
- """Test data splitting with non-posix parser"""
- self.splitTest(self.data, posix=0, spaces=0)
-
def testSplitPosix(self):
"""Test data splitting with posix parser"""
- self.splitTest(self.posix_data, posix=1, spaces=1)
+ self.splitTest(self.posix_data, comments=True)
def testCompat(self):
"""Test compatibility interface"""