Issue #16121: Fix line number accounting in shlex

This commit is contained in:
Petri Lehtinen 2013-02-23 22:07:39 +01:00
parent fead3c8cca
commit 43072780df
4 changed files with 28 additions and 1 deletions

View File

@ -48,6 +48,7 @@ class shlex:
self.state = ' '
self.pushback = deque()
self.lineno = 1
self._lines_found = 0
self.debug = 0
self.token = ''
self.filestack = deque()
@ -118,12 +119,23 @@ class shlex:
return raw
def read_token(self):
if self._lines_found:
self.lineno += self._lines_found
self._lines_found = 0
i = 0
quoted = False
escapedstate = ' '
while True:
i += 1
nextchar = self.instream.read(1)
if nextchar == '\n':
self.lineno = self.lineno + 1
# In case newline is the first character increment lineno
if i == 1:
self.lineno += 1
else:
self._lines_found += 1
if self.debug >= 3:
print "shlex: in state", repr(self.state), \
"I see character:", repr(nextchar)
@ -143,6 +155,7 @@ class shlex:
continue
elif nextchar in self.commenters:
self.instream.readline()
# Not considered a token so incrementing lineno directly
self.lineno = self.lineno + 1
elif self.posix and nextchar in self.escape:
escapedstate = 'a'
@ -210,6 +223,7 @@ class shlex:
continue
elif nextchar in self.commenters:
self.instream.readline()
# Not considered a token so incrementing lineno directly
self.lineno = self.lineno + 1
if self.posix:
self.state = ' '

View File

@ -178,6 +178,15 @@ class ShlexTest(unittest.TestCase):
"%s: %s != %s" %
(self.data[i][0], l, self.data[i][1:]))
def testLineNumbers(self):
data = '"a \n b \n c"\n"x"\n"y"'
for is_posix in (True, False):
s = shlex.shlex(data, posix=is_posix)
for i in (1, 4, 5):
s.read_token()
self.assertEqual(s.lineno, i)
# Allow this test to be used with old shlex.py
if not getattr(shlex, "split", None):
for methname in dir(ShlexTest):

View File

@ -717,6 +717,7 @@ Samuel Nicolary
Gustavo Niemeyer
Oscar Nierstrasz
Hrvoje Niksic
Birk Nilson
Gregory Nofi
Jesse Noller
Bill Noon

View File

@ -208,6 +208,9 @@ Core and Builtins
Library
-------
- Issue #16121: Fix line number accounting in shlex. Patch by Birk
Nilson.
- Issue #14720: sqlite3: Convert datetime microseconds correctly.
Patch by Lowe Thiderman.