[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4
terry.reedy
python-checkins at python.org
Fri Oct 30 02:48:15 EDT 2015
https://hg.python.org/cpython/rev/c548ad75160c
changeset: 98898:c548ad75160c
branch: 3.5
parent: 98894:e6ab376f575e
parent: 98897:38b6b7253ba1
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Oct 30 02:47:33 2015 -0400
summary:
Merge with 3.4
files:
Lib/idlelib/IOBinding.py | 14 ++++++++------
Lib/idlelib/idle_test/htest.py | 8 +++++---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
--- 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 @@
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
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -189,9 +189,11 @@
_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 = {
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list