Commit 406454fd authored by mathieui's avatar mathieui

Fix common.shell_split with empty strings

parent 90161f81
......@@ -232,6 +232,12 @@ def shell_split(st):
>>> shell_split('"sdf 1" "toto 2"')
['sdf 1', 'toto 2']
>>> shell_split('toto "titi"')
['toto', 'titi']
>>> shell_split('toto ""')
['toto', '']
>>> shell_split('"toto titi" toto ""')
['toto titi', 'toto', '']
"""
sh = shlex.shlex(st)
ret = []
......
......@@ -95,20 +95,6 @@ class shlex:
return tok
# No pushback. Get a token.
start, end, raw = self.read_token()
# Handle inclusions
# Maybe we got EOF instead?
while raw == self.eof:
if not self.filestack:
return self.eof
else:
self.pop_source()
start, end, raw = self.get_token()
# Neither inclusion nor EOF
if self.debug >= 1:
if raw != self.eof:
print("shlex: token=" + repr(raw))
else:
print("shlex: token=EOF")
return start, end, raw
def read_token(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment