mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge with 3.5

Browse source
This commit is contained in:
Terry Jan Reedy 2015-10-30 02:47:48 -04:00
commit c6d17c04bc
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/idlelib/IOBinding.py
View file

@ -1,17 +1,16 @@
import codecs
from codecs import BOM_UTF8
import os import os
import re
import shlex import shlex
import sys import sys
import codecs
import tempfile import tempfile
import tkinter.filedialog as tkFileDialog import tkinter.filedialog as tkFileDialog
import tkinter.messagebox as tkMessageBox import tkinter.messagebox as tkMessageBox
import re
from tkinter import *
from tkinter.simpledialog import askstring 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 # Try setting the locale, so that we can find out
# what encoding to use # what encoding to use
@ -525,7 +524,10 @@ class IOBinding:
self.editwin.update_recent_files_list(filename) self.editwin.update_recent_files_list(filename)
def _io_binding(parent): # htest # def _io_binding(parent): # htest #
root = Tk() from tkinter import Toplevel, Text
from idlelib.configHandler import idleConf
root = Toplevel(parent)
root.title("Test IOBinding") root.title("Test IOBinding")
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
root.geometry("+%d+%d"%(x, y + 150)) root.geometry("+%d+%d"%(x, y + 150))

8
Lib/idlelib/idle_test/htest.py
View file

@ -189,9 +189,11 @@ _grep_dialog_spec = {
_io_binding_spec = { _io_binding_spec = {
'file': 'IOBinding', 'file': 'IOBinding',
'kwds': {}, 'kwds': {},
'msg': "Test the following bindings\n" 'msg': "Test the following bindings.\n"
"<Control-o> to display open window from file dialog.\n" "<Control-o> to open file from dialog.\n"
"<Control-s> to save the file\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 = { _multi_call_spec = {