pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don’t escape backslashes unless we are inside a quoted string and the next char is a quote

Browse source 
Sadly, we can’t doctest stuff with backslashes because it drives doctest
crazy.
This commit is contained in:
mathieui 2014-04-28 00:20:57 +02:00
parent 31716565a7
commit 069283e349
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common.py
View file

@ -319,6 +319,8 @@ def shell_split(st):
['toto', 'titi']
>>> shell_split('toto ""')
['toto', '']
>>> shell_split('to"to titi "a" b')
['to"to', 'titi', 'a', 'b']
>>> shell_split('"toto titi" toto ""')
['toto titi', 'toto', '']
>>> shell_split('toto "titi')

21
src/poezio_shlex.py
View file

@ -102,6 +102,7 @@ class shlex(object):
escapedstate = ' '
token_start = 0
token_end = -1
# read one char from the stream at once
while True:
nextchar = self.instream.read(1)
if nextchar == '\n':
@ -126,13 +127,6 @@ class shlex(object):
break # emit current token
else:
continue
elif nextchar in self.commenters:
self.instream.readline()
self.lineno = self.lineno + 1
elif self.posix and nextchar in self.escape:
token_start = self.instream.tell() - 1
escapedstate = 'a'
self.state = nextchar
elif nextchar in self.wordchars:
token_start = self.instream.tell() - 1
self.token = nextchar
@ -181,10 +175,8 @@ class shlex(object):
# XXX what error should be raised here?
token_end = self.instream.tell()
break
# In posix shells, only the quote itself or the escape
# character may be escaped within quotes.
if escapedstate in self.quotes and \
nextchar != self.state and nextchar != escapedstate:
# only the quote may be escaped
if escapedstate in self.quotes and nextchar != escapedstate:
self.token = self.token + self.state
self.token = self.token + nextchar
self.state = escapedstate
@ -202,13 +194,8 @@ class shlex(object):
break # emit current token
else:
continue
elif self.posix and nextchar in self.quotes:
self.state = nextchar
elif self.posix and nextchar in self.escape:
escapedstate = 'a'
self.state = nextchar
elif nextchar in self.wordchars or nextchar in self.quotes \
or self.whitespace_split:
or self.whitespace_split:
self.token = self.token + nextchar
else:
self.pushback.appendleft(nextchar)