diff options
| -rw-r--r-- | Lib/shlex.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_shlex.py | 9 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 1 insertions, 28 deletions
diff --git a/Lib/shlex.py b/Lib/shlex.py index b9fd1dd..3edd3db 100644 --- a/Lib/shlex.py +++ b/Lib/shlex.py @@ -44,7 +44,6 @@ class shlex: self.state = ' ' self.pushback = deque() self.lineno = 1 - self._lines_found = 0 self.debug = 0 self.token = '' self.filestack = deque() @@ -115,23 +114,12 @@ 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': - # In case newline is the first character increment lineno - if i == 1: - self.lineno += 1 - else: - self._lines_found += 1 - + self.lineno = self.lineno + 1 if self.debug >= 3: print("shlex: in state", repr(self.state), \ "I see character:", repr(nextchar)) @@ -151,7 +139,6 @@ 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' @@ -219,7 +206,6 @@ 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 = ' ' diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py index 1cd8220..25e4b6d 100644 --- a/Lib/test/test_shlex.py +++ b/Lib/test/test_shlex.py @@ -173,15 +173,6 @@ 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): @@ -774,7 +774,6 @@ Samuel Nicolary Gustavo Niemeyer Oscar Nierstrasz Hrvoje Niksic -Birk Nilson Gregory Nofi Jesse Noller Bill Noon @@ -227,9 +227,6 @@ 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. |