mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #16121: Fix line number accounting in shlex

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

16
Lib/shlex.py
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 = ' '