mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
bpo-32905: IDLE - remove unused code in pyparse module (GH-5807)
dump is similar to print but less flexible. lastopenbracketpos is now always initialized in _study2, as was stmt_bracketing, so the class settings are not needed. get_last_open_bracket_pos is never called.
This commit is contained in:
parent
745dc65b17
commit
451d1edaf4
3 changed files with 8 additions and 50 deletions
|
@ -1,4 +1,7 @@
|
||||||
"""Unittest for idlelib.pyparse.py."""
|
"""Unittest for idlelib.pyparse.py.
|
||||||
|
|
||||||
|
Coverage: 97%
|
||||||
|
"""
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
import unittest
|
import unittest
|
||||||
|
@ -272,8 +275,6 @@ class PyParseTest(unittest.TestCase):
|
||||||
)
|
)
|
||||||
|
|
||||||
for test in tests:
|
for test in tests:
|
||||||
# There is a bug where this is carried forward from last item.
|
|
||||||
p.lastopenbracketpos = None
|
|
||||||
with self.subTest(string=test.string):
|
with self.subTest(string=test.string):
|
||||||
setstr(test.string)
|
setstr(test.string)
|
||||||
study()
|
study()
|
||||||
|
@ -464,33 +465,6 @@ class PyParseTest(unittest.TestCase):
|
||||||
setstr(test.string)
|
setstr(test.string)
|
||||||
test.assert_(closer())
|
test.assert_(closer())
|
||||||
|
|
||||||
def test_get_last_open_bracket_pos(self):
|
|
||||||
eq = self.assertEqual
|
|
||||||
p = self.parser
|
|
||||||
setstr = p.set_str
|
|
||||||
openbracket = p.get_last_open_bracket_pos
|
|
||||||
|
|
||||||
TestInfo = namedtuple('TestInfo', ['string', 'position'])
|
|
||||||
tests = (
|
|
||||||
TestInfo('', None),
|
|
||||||
TestInfo('a\n', None),
|
|
||||||
TestInfo('# (\n', None),
|
|
||||||
TestInfo('""" (\n', None),
|
|
||||||
TestInfo('a = (1 + 2) - 5 *\\\n', None),
|
|
||||||
TestInfo('\n def function1(self, a,\n', 17),
|
|
||||||
TestInfo('\n def function1(self, a, # End of line comment.\n', 17),
|
|
||||||
TestInfo('{)(]\n', None),
|
|
||||||
TestInfo('(((((((((()))))))\n', 2),
|
|
||||||
TestInfo('(((((((((())\n)))\n))\n', 2),
|
|
||||||
)
|
|
||||||
|
|
||||||
for test in tests:
|
|
||||||
# There is a bug where the value is carried forward from last item.
|
|
||||||
p.lastopenbracketpos = None
|
|
||||||
with self.subTest(string=test.string):
|
|
||||||
setstr(test.string)
|
|
||||||
eq(openbracket(), test.position)
|
|
||||||
|
|
||||||
def test_get_last_stmt_bracketing(self):
|
def test_get_last_stmt_bracketing(self):
|
||||||
eq = self.assertEqual
|
eq = self.assertEqual
|
||||||
p = self.parser
|
p = self.parser
|
||||||
|
|
|
@ -18,10 +18,6 @@ import sys
|
||||||
(C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE,
|
(C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE,
|
||||||
C_STRING_NEXT_LINES, C_BRACKET) = range(5)
|
C_STRING_NEXT_LINES, C_BRACKET) = range(5)
|
||||||
|
|
||||||
if 0: # for throwaway debugging output
|
|
||||||
def dump(*stuff):
|
|
||||||
sys.__stdout__.write(" ".join(map(str, stuff)) + "\n")
|
|
||||||
|
|
||||||
# Find what looks like the start of a popular statement.
|
# Find what looks like the start of a popular statement.
|
||||||
|
|
||||||
_synchre = re.compile(r"""
|
_synchre = re.compile(r"""
|
||||||
|
@ -496,8 +492,7 @@ class Parser:
|
||||||
# end while p < q:
|
# end while p < q:
|
||||||
|
|
||||||
self.lastch = lastch
|
self.lastch = lastch
|
||||||
if stack:
|
self.lastopenbracketpos = stack[-1] if stack else None
|
||||||
self.lastopenbracketpos = stack[-1]
|
|
||||||
self.stmt_bracketing = tuple(bracketing)
|
self.stmt_bracketing = tuple(bracketing)
|
||||||
|
|
||||||
def compute_bracket_indent(self):
|
def compute_bracket_indent(self):
|
||||||
|
@ -620,22 +615,10 @@ class Parser:
|
||||||
self._study2()
|
self._study2()
|
||||||
return _closere(self.str, self.stmt_start) is not None
|
return _closere(self.str, self.stmt_start) is not None
|
||||||
|
|
||||||
# XXX - is this used?
|
|
||||||
lastopenbracketpos = None
|
|
||||||
|
|
||||||
def get_last_open_bracket_pos(self):
|
|
||||||
"Return index of last open bracket or None."
|
|
||||||
self._study2()
|
|
||||||
return self.lastopenbracketpos
|
|
||||||
|
|
||||||
# XXX - is this used?
|
|
||||||
stmt_bracketing = None
|
|
||||||
|
|
||||||
def get_last_stmt_bracketing(self):
|
def get_last_stmt_bracketing(self):
|
||||||
"""Return a tuple of the structure of the bracketing of the last
|
"""Return bracketing structure of the last interesting statement.
|
||||||
interesting statement.
|
|
||||||
|
|
||||||
Tuple is in the format defined in _study2().
|
The returned tuple is in the format defined in _study2().
|
||||||
"""
|
"""
|
||||||
self._study2()
|
self._study2()
|
||||||
return self.stmt_bracketing
|
return self.stmt_bracketing
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Remove unused code in pyparse module.
|
Loading…
Add table
Add a link
Reference in a new issue