Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Changes by Mark Hammond: (1) support optional output_sep argument to 

the constructor so he can eliminate the sys.ps2 that PythonWin leaves
in the source; (2) remove duplicate history items.
This commit is contained in:
Guido van Rossum 1999-06-02 12:06:47 +00:00
parent 808fa4993e
commit 1709041e73
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tools/idle/IdleHistory.py
View File

@ -2,11 +2,12 @@ import string
class History: class History:
def __init__(self, text): def __init__(self, text, output_sep = "\n"):
self.text = text self.text = text
self.history = [] self.history = []
self.history_prefix = None self.history_prefix = None
self.history_pointer = None self.history_pointer = None
self.output_sep = output_sep
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)
@ -18,16 +19,26 @@ class History:
self.history_do(1) self.history_do(1)
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 = string.split(self.text.get(start, end), self.output_sep)
return string.join(lines, "\n")
def _put_source(self, where, source):
output = string.join(string.split(source, "\n"), self.output_sep)
self.text.insert(where, output)
def history_do(self, reverse): def history_do(self, reverse):
nhist = len(self.history) nhist = len(self.history)
pointer = self.history_pointer pointer = self.history_pointer
prefix = self.history_prefix prefix = self.history_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.text.get("iomark", "end-1c") != self.history[pointer]: self._get_source("iomark", "end-1c") != self.history[pointer]:
pointer = prefix = None pointer = prefix = None
if pointer is None or prefix is None: if pointer is None or prefix is None:
prefix = self.text.get("iomark", "end-1c") prefix = self._get_source("iomark", "end-1c")
if reverse: if reverse:
pointer = nhist pointer = nhist
else: else:
@ -40,15 +51,15 @@ class History:
pointer = pointer + 1 pointer = pointer + 1
if pointer < 0 or pointer >= nhist: if pointer < 0 or pointer >= nhist:
self.text.bell() self.text.bell()
if self.text.get("iomark", "end-1c") != prefix: if self._get_source("iomark", "end-1c") != prefix:
self.text.delete("iomark", "end-1c") self.text.delete("iomark", "end-1c")
self.text.insert("iomark", prefix) self._put_source("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.text.insert("iomark", item) self._put_source("iomark", item)
break break
self.text.mark_set("insert", "end-1c") self.text.mark_set("insert", "end-1c")
self.text.see("insert") self.text.see("insert")
@ -59,6 +70,11 @@ class History:
def history_store(self, source): def history_store(self, source):
source = string.strip(source) source = string.strip(source)
if len(source) > 2: if len(source) > 2:
# avoid duplicates
try:
self.history.remove(source)
except ValueError:
pass
self.history.append(source) self.history.append(source)
self.history_pointer = None self.history_pointer = None
self.history_prefix = None self.history_prefix = None