Issue #25507: revert incorrect movement of idleConf import in a37ea1d56e98.

Augment htest to include all major IOBinding functions.

diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
index 3b39606d9d9a4f3d854788c93f75c39b039443ba..ef40715d2254288ae2f6ae76a247bdde71cf20fe 100644 (file)
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -17,6 +17,8 @@ import tkFileDialog
 import tkMessageBox
 from SimpleDialog import SimpleDialog
 
+from idlelib.configHandler import idleConf
+
 # Try setting the locale, so that we can find out
 # what encoding to use
 try:
@@ -137,7 +139,6 @@ def coding_spec(str):
         raise LookupError, "Unknown encoding "+name
     return name
 
-
 class IOBinding:
 
     def __init__(self, editwin):
@@ -567,7 +568,6 @@ class IOBinding:
 
 def _io_binding(parent):  # htest #
     from Tkinter import Toplevel, Text
-    from idlelib.configHandler import idleConf
 
     root = Toplevel(parent)
     root.title("Test IOBinding")
@@ -578,15 +578,24 @@ def _io_binding(parent):  # htest #
             self.text = text
             self.flist = None
             self.text.bind("<Control-o>", self.open)
+            self.text.bind('<Control-p>', self.printer)
             self.text.bind("<Control-s>", self.save)
+            self.text.bind("<Alt-s>", self.saveas)
+            self.text.bind('<Control-c>', self.savecopy)
         def get_saved(self): return 0
         def set_saved(self, flag): pass
         def reset_undo(self): pass
+        def update_recent_files_list(self, filename): pass
         def open(self, event):
             self.text.event_generate("<<open-window-from-file>>")
+        def printer(self, event):
+            self.text.event_generate("<<print-window>>")
         def save(self, event):
             self.text.event_generate("<<save-window>>")
-        def update_recent_files_list(s, f): pass
+        def saveas(self, event):
+            self.text.event_generate("<<save-window-as-file>>")
+        def savecopy(self, event):
+            self.text.event_generate("<<save-copy-of-window-as-file>>")
 
     text = Text(root)
     text.pack()

diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py
index a3e6d3a88e2455861aa60b255a36a961c0cf9d67..f34140921c81f42602a4214e82baa4b4c0f34465 100644 (file)
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -192,7 +192,10 @@ _io_binding_spec = {
     'msg': "Test the following bindings.\n"
            "<Control-o> to open file from dialog.\n"
            "Edit the file.\n"
+           "<Control-p> to print the file.\n"
            "<Control-s> to save the file.\n"
+           "<Alt-s> to save-as another file.\n"
+           "<Control-c> to save-copy-as another file.\n"
            "Check that changes were saved by opening the file elsewhere."
     }