Skip to content

C
cpython
Commit c29c03a3 authored by Cheryl Sabella's avatar Cheryl Sabella Committed by Terry Jan Reedy
Browse files
Options

bpo-32916: IDLE: Change `str` to `code` in pyparse (GH-5830) 

Adjust tests and user modules to match.
parent 11a1493b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 102 deletions
Lib/idlelib/editor.py
View file @ c29c03a3
......@@ -1302,7 +1302,7 @@ class EditorWindow(object):
startat = max(lno - context, 1)
startatindex = repr(startat) + ".0"
rawtext = text.get(startatindex, "insert")
y.set_str(rawtext)
y.set_code(rawtext)
bod = y.find_good_parse_start(
self.context_use_ps1,
self._build_char_in_string_func(startatindex))
......@@ -1316,7 +1316,7 @@ class EditorWindow(object):
else:
startatindex = "1.0"
rawtext = text.get(startatindex, "insert")
y.set_str(rawtext)
y.set_code(rawtext)
y.set_lo(0)
c = y.get_continuation_type()
......
Lib/idlelib/hyperparser.py
View file @ c29c03a3
......@@ -44,7 +44,7 @@ class HyperParser:
# at end. We add a space so that index won't be at end
# of line, so that its status will be the same as the
# char before it, if should.
parser.set_str(text.get(startatindex, stopatindex)+' \n')
parser.set_code(text.get(startatindex, stopatindex)+' \n')
bod = parser.find_good_parse_start(
editwin._build_char_in_string_func(startatindex))
if bod is not None or startat == 1:
......@@ -60,12 +60,12 @@ class HyperParser:
# We add the newline because PyParse requires it. We add a
# space so that index won't be at end of line, so that its
# status will be the same as the char before it, if should.
parser.set_str(text.get(startatindex, stopatindex)+' \n')
parser.set_code(text.get(startatindex, stopatindex)+' \n')
parser.set_lo(0)
# We want what the parser has, minus the last newline and space.
self.rawtext = parser.str[:-2]
# Parser.str apparently preserves the statement we are in, so
self.rawtext = parser.code[:-2]
# Parser.code apparently preserves the statement we are in, so
# that stopatindex can be used to synchronize the string with
# the text box indices.
self.stopatindex = stopatindex
......
Lib/idlelib/idle_test/test_pyparse.py
View file @ c29c03a3
......@@ -62,32 +62,32 @@ class PyParseTest(unittest.TestCase):
self.assertEqual(self.parser.indentwidth, 4)
self.assertEqual(self.parser.tabwidth, 4)
def test_set_str(self):
def test_set_code(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
# Not empty and doesn't end with newline.
with self.assertRaises(AssertionError):
setstr('a')
setcode('a')
tests = ('',
'a\n')
for string in tests:
with self.subTest(string=string):
setstr(string)
eq(p.str, string)
setcode(string)
eq(p.code, string)
eq(p.study_level, 0)
def test_find_good_parse_start(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
start = p.find_good_parse_start
# Split def across lines.
setstr('"""This is a module docstring"""\n'
setcode('"""This is a module docstring"""\n'
'class C():\n'
' def __init__(self, a,\n'
' b=True):\n'
......@@ -117,7 +117,7 @@ class PyParseTest(unittest.TestCase):
# Code without extra line break in def line - mostly returns the same
# values.
setstr('"""This is a module docstring"""\n'
setcode('"""This is a module docstring"""\n'
'class C():\n'
' def __init__(self, a, b=True):\n'
' pass\n'
......@@ -138,19 +138,19 @@ class PyParseTest(unittest.TestCase):
' pass\n'
)
p = self.parser
p.set_str(code)
p.set_code(code)
# Previous character is not a newline.
with self.assertRaises(AssertionError):
p.set_lo(5)
# A value of 0 doesn't change self.str.
# A value of 0 doesn't change self.code.
p.set_lo(0)
self.assertEqual(p.str, code)
self.assertEqual(p.code, code)
# An index that is preceded by a newline.
p.set_lo(44)
self.assertEqual(p.str, code[44:])
self.assertEqual(p.code, code[44:])
def test_tran(self):
self.assertEqual('\t a([{b}])b"c\'d\n'.translate(self.parser._tran),
......@@ -159,7 +159,7 @@ class PyParseTest(unittest.TestCase):
def test_study1(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
study = p._study1
(NONE, BACKSLASH, FIRST, NEXT, BRACKET) = range(5)
......@@ -197,7 +197,7 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string) # resets study_level
setcode(test.string) # resets study_level
study()
eq(p.study_level, 1)
eq(p.goodlines, test.goodlines)
......@@ -209,7 +209,7 @@ class PyParseTest(unittest.TestCase):
def test_get_continuation_type(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
gettype = p.get_continuation_type
(NONE, BACKSLASH, FIRST, NEXT, BRACKET) = range(5)
......@@ -224,13 +224,13 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
eq(gettype(), test.continuation)
def test_study2(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
study = p._study2
TestInfo = namedtuple('TestInfo', ['string', 'start', 'end', 'lastch',
......@@ -276,7 +276,7 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
study()
eq(p.study_level, 2)
eq(p.stmt_start, test.start)
......@@ -291,7 +291,7 @@ class PyParseTest(unittest.TestCase):
def test_get_num_lines_in_stmt(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
getlines = p.get_num_lines_in_stmt
TestInfo = namedtuple('TestInfo', ['string', 'lines'])
......@@ -307,19 +307,19 @@ class PyParseTest(unittest.TestCase):
)
# Blank string doesn't have enough elements in goodlines.
setstr('')
setcode('')
with self.assertRaises(IndexError):
getlines()
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
eq(getlines(), test.lines)
def test_compute_bracket_indent(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
indent = p.compute_bracket_indent
TestInfo = namedtuple('TestInfo', ['string', 'spaces'])
......@@ -340,18 +340,18 @@ class PyParseTest(unittest.TestCase):
)
# Must be C_BRACKET continuation type.
setstr('def function1(self, a, b):\n')
setcode('def function1(self, a, b):\n')
with self.assertRaises(AssertionError):
indent()
for test in tests:
setstr(test.string)
setcode(test.string)
eq(indent(), test.spaces)
def test_compute_backslash_indent(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
indent = p.compute_backslash_indent
# Must be C_BACKSLASH continuation type.
......@@ -361,7 +361,7 @@ class PyParseTest(unittest.TestCase):
)
for string in errors:
with self.subTest(string=string):
setstr(string)
setcode(string)
with self.assertRaises(AssertionError):
indent()
......@@ -384,13 +384,13 @@ class PyParseTest(unittest.TestCase):
)
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
eq(indent(), test.spaces)
def test_get_base_indent_string(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
baseindent = p.get_base_indent_string
TestInfo = namedtuple('TestInfo', ['string', 'indent'])
......@@ -405,14 +405,14 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
eq(baseindent(), test.indent)
def test_is_block_opener(self):
yes = self.assertTrue
no = self.assertFalse
p = self.parser
setstr = p.set_str
setcode = p.set_code
opener = p.is_block_opener
TestInfo = namedtuple('TestInfo', ['string', 'assert_'])
......@@ -433,14 +433,14 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
test.assert_(opener())
def test_is_block_closer(self):
yes = self.assertTrue
no = self.assertFalse
p = self.parser
setstr = p.set_str
setcode = p.set_code
closer = p.is_block_closer
TestInfo = namedtuple('TestInfo', ['string', 'assert_'])
......@@ -462,13 +462,13 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
test.assert_(closer())
def test_get_last_stmt_bracketing(self):
eq = self.assertEqual
p = self.parser
setstr = p.set_str
setcode = p.set_code
bracketing = p.get_last_stmt_bracketing
TestInfo = namedtuple('TestInfo', ['string', 'bracket'])
......@@ -489,7 +489,7 @@ class PyParseTest(unittest.TestCase):
for test in tests:
with self.subTest(string=test.string):
setstr(test.string)
setcode(test.string)
eq(bracketing(), test.bracket)
......
Lib/idlelib/pyparse.py
View file @ c29c03a3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7