Merge Py Idle changes:

Rev 1.5  doerwalter
string methods
This commit is contained in:
Kurt B. Kaiser 2002-09-16 22:09:19 +00:00
parent 01166da85a
commit 6b06f29d09
1 changed files with 5 additions and 7 deletions

View File

@ -1,5 +1,3 @@
import string
class History: class History:
def __init__(self, text, output_sep = "\n"): def __init__(self, text, output_sep = "\n"):
@ -22,11 +20,11 @@ class History:
def _get_source(self, start, end): def _get_source(self, start, end):
# Get source code from start index to end index. Lines in the # Get source code from start index to end index. Lines in the
# text control may be separated by sys.ps2 . # text control may be separated by sys.ps2 .
lines = string.split(self.text.get(start, end), self.output_sep) lines = self.text.get(start, end).split(self.output_sep)
return string.join(lines, "\n") return "\n".join(lines)
def _put_source(self, where, source): def _put_source(self, where, source):
output = string.join(string.split(source, "\n"), self.output_sep) output = self.output_sep.join(source.split("\n"))
self.text.insert(where, output) self.text.insert(where, output)
def history_do(self, reverse): def history_do(self, reverse):
@ -68,7 +66,7 @@ class History:
self.history_prefix = prefix self.history_prefix = prefix
def history_store(self, source): def history_store(self, source):
source = string.strip(source) source = source.strip()
if len(source) > 2: if len(source) > 2:
# avoid duplicates # avoid duplicates
try: try:
@ -80,7 +78,7 @@ class History:
self.history_prefix = None self.history_prefix = None
def recall(self, s): def recall(self, s):
s = string.strip(s) s = s.strip()
self.text.tag_remove("sel", "1.0", "end") self.text.tag_remove("sel", "1.0", "end")
self.text.delete("iomark", "end-1c") self.text.delete("iomark", "end-1c")
self.text.mark_set("insert", "end-1c") self.text.mark_set("insert", "end-1c")