Merge with 3.4

2 files changed, 13 insertions, 9 deletions

diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
index 1e93987..5ec9d54 100644
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -1,17 +1,16 @@
+import codecs
+from codecs import BOM_UTF8
 import os
+import re
 import shlex
 import sys
-import codecs
 import tempfile
+
 import tkinter.filedialog as tkFileDialog
 import tkinter.messagebox as tkMessageBox
-import re
-from tkinter import *
 from tkinter.simpledialog import askstring
 
-from idlelib.configHandler import idleConf
 
-from codecs import BOM_UTF8
 
 # Try setting the locale, so that we can find out
 # what encoding to use
@@ -525,7 +524,10 @@ class IOBinding:
             self.editwin.update_recent_files_list(filename)
 
 def _io_binding(parent):  # htest #
-    root = Tk()
+    from tkinter import Toplevel, Text
+    from idlelib.configHandler import idleConf
+
+    root = Toplevel(parent)
     root.title("Test IOBinding")
     width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
     root.geometry("+%d+%d"%(x, y + 150))
diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py
index b0f4340..3e24518 100644
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -189,9 +189,11 @@ _grep_dialog_spec = {
 _io_binding_spec = {
     'file': 'IOBinding',
     'kwds': {},
-    'msg': "Test the following bindings\n"
-           "<Control-o> to display open window from file dialog.\n"
-           "<Control-s> to save the file\n"
+    'msg': "Test the following bindings.\n"
+           "<Control-o> to open file from dialog.\n"
+           "Edit the file.\n"
+           "<Control-s> to save the file.\n"
+           "Check that changes were saved by opening the file elsewhere."
     }
 
 _multi_call_spec = {