Checking in IDLE 0.2.

Much has changed -- too much, in fact, to write down.
The big news is that there's a standard way to write IDLE extensions;
see extend.txt.  Some sample extensions have been provided, and
some existing code has been converted to extensions.  Probably the
biggest new user feature is a new search dialog with more options,
search and replace, and even search in files (grep).

This is exactly as downloaded from my laptop after returning
from the holidays -- it hasn't even been tested on Unix yet.

1 files changed, 84 insertions, 23 deletions

diff --git a/Tools/idle/IOBinding.py b/Tools/idle/IOBinding.py
index 0d61afc..6a41a37 100644
--- a/Tools/idle/IOBinding.py
+++ b/Tools/idle/IOBinding.py
@@ -2,20 +2,42 @@ import os
 import tkFileDialog
 import tkMessageBox
 
+#$ event <<open-window-from-file>>
+#$ win <Control-o>
+#$ unix <Control-x><Control-f>
 
-class IOBinding:
+#$ event <<save-window>>
+#$ win <Control-s>
+#$ unix <Control-x><Control-s>
+
+#$ event <<save-window-as-file>>
+#$ win <Alt-s>
+#$ unix <Control-x><Control-w>
+
+#$ event <<save-copy-of-window-as-file>>
+#$ win <Alt-Shift-s>
+#$ unix <Control-x><w>
 
-    # Calls to non-standard text methods:
-    # reset_undo()
-    # set_saved(1)
 
-    def __init__(self, text):
-        self.text = text
+class IOBinding:
+
+    def __init__(self, editwin):
+        self.editwin = editwin
+        self.text = editwin.text
         self.text.bind("<<open-window-from-file>>", self.open)
         self.text.bind("<<save-window>>", self.save)
         self.text.bind("<<save-window-as-file>>", self.save_as)
         self.text.bind("<<save-copy-of-window-as-file>>", self.save_a_copy)
 
+    def get_saved(self):
+        return self.editwin.get_saved()
+
+    def set_saved(self, flag):
+        self.editwin.set_saved(flag)
+
+    def reset_undo(self):
+        self.editwin.reset_undo()
+
     filename_change_hook = None
 
     def set_filename_change_hook(self, hook):
@@ -25,18 +47,29 @@ class IOBinding:
 
     def set_filename(self, filename):
         self.filename = filename
-        self.text.set_saved(1)
+        self.set_saved(1)
         if self.filename_change_hook:
             self.filename_change_hook()
 
     def open(self, event):
-        if not self.text.get_saved():
+        if self.editwin.flist:
+            filename = self.askopenfile()
+            if filename:
+                self.editwin.flist.open(filename)
+            else:
+                self.text.focus_set()
+            return "break"
+        # Code for use outside IDLE:
+        if self.get_saved():
             reply = self.maybesave()
             if reply == "cancel":
+                self.text.focus_set()
                 return "break"
         filename = self.askopenfile()
         if filename:
             self.loadfile(filename)
+        else:
+            self.text.focus_set()
         return "break"
 
     def loadfile(self, filename):
@@ -50,14 +83,14 @@ class IOBinding:
         self.text.delete("1.0", "end")
         self.set_filename(None)
         self.text.insert("1.0", chars)
-        self.text.reset_undo()
+        self.reset_undo()
         self.set_filename(filename)
         self.text.mark_set("insert", "1.0")
         self.text.see("insert")
         return 1
 
     def maybesave(self):
-        if self.text.get_saved():
+        if self.get_saved():
             return "yes"
         message = "Do you want to save %s before closing?" % (
             self.filename or "this untitled document")
@@ -70,8 +103,9 @@ class IOBinding:
         reply = m.show()
         if reply == "yes":
             self.save(None)
-            if not self.text.get_saved():
+            if not self.get_saved():
                 reply = "cancel"
+        self.text.focus_set()
         return reply
 
     def save(self, event):
@@ -79,7 +113,8 @@ class IOBinding:
             self.save_as(event)
         else:
             if self.writefile(self.filename):
-                self.text.set_saved(1)
+                self.set_saved(1)
+        self.text.focus_set()
         return "break"
 
     def save_as(self, event):
@@ -87,22 +122,23 @@ class IOBinding:
         if filename:
             if self.writefile(filename):
                 self.set_filename(filename)
-                self.text.set_saved(1)
+                self.set_saved(1)
+        self.text.focus_set()
         return "break"
 
     def save_a_copy(self, event):
         filename = self.asksavefile()
         if filename:
             self.writefile(filename)
+        self.text.focus_set()
         return "break"
 
     def writefile(self, filename):
+        self.fixlastline()
         try:
             f = open(filename, "w")
             chars = self.text.get("1.0", "end-1c")
             f.write(chars)
-            if chars and chars[-1] != "\n":
-                f.write("\n")
             f.close()
             ## print "saved to", `filename`
             return 1
@@ -111,11 +147,16 @@ class IOBinding:
                                    master=self.text)
             return 0
 
+    def fixlastline(self):
+        c = self.text.get("end-2c")
+        if c != '\n':
+            self.text.insert("end-1c", "\n")
+
     opendialog = None
     savedialog = None
 
     filetypes = [
-        ("Python files", "*.py", "TEXT"),
+        ("Python and text files", "*.py *.pyw *.txt", "TEXT"),
         ("All text files", "*", "TEXT"),
         ("All files", "*"),
         ]
@@ -129,10 +170,13 @@ class IOBinding:
 
     def defaultfilename(self, mode="open"):
         if self.filename:
-            dir, base = os.path.split(self.filename)
+            return os.path.split(self.filename)
         else:
-            dir = base = ""
-        return dir, base
+            try:
+                pwd = os.getcwd()
+            except os.error:
+                pwd = ""
+            return pwd, ""
 
     def asksavefile(self):
         dir, base = self.defaultfilename("save")
@@ -145,13 +189,30 @@ class IOBinding:
 def test():
     from Tkinter import *
     root = Tk()
-    class MyText(Text):
-        def reset_undo(self): pass
+    class MyEditWin:
+        def __init__(self, text):
+            self.text = text
+            self.flist = None
+            self.text.bind("<Control-o>", self.open)
+            self.text.bind("<Control-s>", self.save)
+            self.text.bind("<Alt-s>", self.save_as)
+            self.text.bind("<Alt-z>", self.save_a_copy)
+        def get_saved(self): return 0
         def set_saved(self, flag): pass
-    text = MyText(root)
+        def reset_undo(self): pass
+        def open(self, event):
+            self.text.event_generate("<<open-window-from-file>>")
+        def save(self, event):
+            self.text.event_generate("<<save-window>>")
+        def save_as(self, event):
+            self.text.event_generate("<<save-window-as-file>>")
+        def save_a_copy(self, event):
+            self.text.event_generate("<<save-copy-of-window-as-file>>")
+    text = Text(root)
     text.pack()
     text.focus_set()
-    io = IOBinding(text)
+    editwin = MyEditWin(text)
+    io = IOBinding(editwin)
     root.mainloop()
 
 if __name__ == "__main__":