traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closes #29132: Merged fix from 3.6.

This commit is contained in:
Vinay Sajip 2017-01-15 10:07:56 +00:00
parent f25dec904c 61eda7260a
commit fc4b438163
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/shlex.py
View File

@ -232,11 +232,6 @@ class shlex:
break # emit current token break # emit current token
else: else:
continue 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 self.state == 'c': elif self.state == 'c':
if nextchar in self.punctuation_chars: if nextchar in self.punctuation_chars:
self.token += nextchar self.token += nextchar
@ -245,6 +240,11 @@ class shlex:
self._pushback_chars.append(nextchar) self._pushback_chars.append(nextchar)
self.state = ' ' self.state = ' '
break break
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 elif (nextchar in self.wordchars or nextchar in self.quotes
or self.whitespace_split): or self.whitespace_split):
self.token += nextchar self.token += nextchar

8
Lib/test/test_shlex.py
View File

@ -273,6 +273,14 @@ class ShlexTest(unittest.TestCase):
# white space # white space
self.assertEqual(list(s), ['a', '&&', 'b', '||', 'c']) self.assertEqual(list(s), ['a', '&&', 'b', '||', 'c'])
def testPunctuationWithPosix(self):
"""Test that punctuation_chars and posix behave correctly together."""
# see Issue #29132
s = shlex.shlex('f >"abc"', posix=True, punctuation_chars=True)
self.assertEqual(list(s), ['f', '>', 'abc'])
s = shlex.shlex('f >\\"abc\\"', posix=True, punctuation_chars=True)
self.assertEqual(list(s), ['f', '>', '"abc"'])
def testEmptyStringHandling(self): def testEmptyStringHandling(self):
"""Test that parsing of empty strings is correctly handled.""" """Test that parsing of empty strings is correctly handled."""
# see Issue #21999 # see Issue #21999