traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #18732: Remove unused* parameter output_sep from IdleHistory.History 

and paired splits and joins that do nothing when output_sep is its default \n.
*It in unused in that the class in only instantiated once, with the default.
Make a few other changes in .fetch and its test.
This commit is contained in:
Terry Jan Reedy 2013-08-15 16:19:07 -04:00
parent 74b3290c10
commit 1703df6c93
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Lib/idlelib/IdleHistory.py
View File

@ -10,7 +10,7 @@ class History:
history_next - Bound to <<history-next>> event (default Alt-N). history_next - Bound to <<history-next>> event (default Alt-N).
history_prev - Bound to <<history-prev>> event (default Alt-P). history_prev - Bound to <<history-prev>> event (default Alt-P).
''' '''
def __init__(self, text, output_sep = "\n"): def __init__(self, text):
'''Initialize data attributes and bind event methods. '''Initialize data attributes and bind event methods.
.text - Idle wrapper of tk Text widget, with .bell(). .text - Idle wrapper of tk Text widget, with .bell().
@ -23,7 +23,6 @@ class History:
self.history = [] self.history = []
self.prefix = None self.prefix = None
self.pointer = None self.pointer = None
self.output_sep = output_sep
self.cyclic = idleConf.GetOption("main", "History", "cyclic", 1, "bool") self.cyclic = idleConf.GetOption("main", "History", "cyclic", 1, "bool")
text.bind("<<history-previous>>", self.history_prev) text.bind("<<history-previous>>", self.history_prev)
text.bind("<<history-next>>", self.history_next) text.bind("<<history-next>>", self.history_next)
@ -38,16 +37,6 @@ class History:
self.fetch(reverse=True) self.fetch(reverse=True)
return "break" return "break"
def _get_source(self, start, end):
# Get source code from start index to end index. Lines in the
# text control may be separated by sys.ps2 .
lines = self.text.get(start, end).split(self.output_sep)
return "\n".join(lines)
def _put_source(self, where, source):
output = self.output_sep.join(source.split("\n"))
self.text.insert(where, output)
def fetch(self, reverse): def fetch(self, reverse):
'''Fetch statememt and replace current line in text widget. '''Fetch statememt and replace current line in text widget.
@ -61,10 +50,11 @@ class History:
prefix = self.prefix prefix = self.prefix
if pointer is not None and prefix is not None: if pointer is not None and prefix is not None:
if self.text.compare("insert", "!=", "end-1c") or \ if self.text.compare("insert", "!=", "end-1c") or \
self._get_source("iomark", "end-1c") != self.history[pointer]: self.text.get("iomark", "end-1c") != self.history[pointer]:
pointer = prefix = None pointer = prefix = None
self.text.mark_set("insert", "end-1c") # != after cursor move
if pointer is None or prefix is None: if pointer is None or prefix is None:
prefix = self._get_source("iomark", "end-1c") prefix = self.text.get("iomark", "end-1c")
if reverse: if reverse:
pointer = nhist # will be decremented pointer = nhist # will be decremented
else: else:
@ -75,26 +65,22 @@ class History:
return return
nprefix = len(prefix) nprefix = len(prefix)
while 1: while 1:
if reverse: pointer += -1 if reverse else 1
pointer = pointer - 1
else:
pointer = pointer + 1
if pointer < 0 or pointer >= nhist: if pointer < 0 or pointer >= nhist:
self.text.bell() self.text.bell()
if not self.cyclic and pointer < 0: # abort history_prev if not self.cyclic and pointer < 0: # abort history_prev
return return
else: else:
if self._get_source("iomark", "end-1c") != prefix: if self.text.get("iomark", "end-1c") != prefix:
self.text.delete("iomark", "end-1c") self.text.delete("iomark", "end-1c")
self._put_source("iomark", prefix) self.text.insert("iomark", prefix)
pointer = prefix = None pointer = prefix = None
break break
item = self.history[pointer] item = self.history[pointer]
if item[:nprefix] == prefix and len(item) > nprefix: if item[:nprefix] == prefix and len(item) > nprefix:
self.text.delete("iomark", "end-1c") self.text.delete("iomark", "end-1c")
self._put_source("iomark", item) self.text.insert("iomark", item)
break break
self.text.mark_set("insert", "end-1c")
self.text.see("insert") self.text.see("insert")
self.text.tag_remove("sel", "1.0", "end") self.text.tag_remove("sel", "1.0", "end")
self.pointer = pointer self.pointer = pointer
@ -114,7 +100,7 @@ class History:
self.prefix = None self.prefix = None
if __name__ == "__main__": if __name__ == "__main__":
from test import support from test import test_support as support
support.use_resources = ['gui'] support.use_resources = ['gui']
from unittest import main from unittest import main
main('idlelib.idle_test.test_idlehistory', verbosity=2, exit=False) main('idlelib.idle_test.test_idlehistory', verbosity=2, exit=False)

2
Lib/idlelib/idle_test/test_idlehistory.py
View File

@ -87,6 +87,7 @@ class FetchTest(unittest.TestCase):
# The last two are diagnostic of fetch internals. # The last two are diagnostic of fetch internals.
History = self.history History = self.history
History.fetch(reverse) History.fetch(reverse)
Equal = self.assertEqual Equal = self.assertEqual
Equal(self.text.get('iomark', 'end-1c'), line) Equal(self.text.get('iomark', 'end-1c'), line)
Equal(self.text._bell, bell) Equal(self.text._bell, bell)
@ -94,6 +95,7 @@ class FetchTest(unittest.TestCase):
self.text._bell = False self.text._bell = False
Equal(History.prefix, prefix) Equal(History.prefix, prefix)
Equal(History.pointer, index) Equal(History.pointer, index)
Equal(self.text.compare("insert", '==', "end-1c"), 1)
def test_fetch_prev_cyclic(self): def test_fetch_prev_cyclic(self):
prefix = '' prefix = ''