Issue #11896: Save on Close failed despite selecting "Yes" in dialog.

_tkinter.c is returning <class '_tkinter.Tcl_Obj'> sometimes.  Don't use
tkinter.messagebox.Message - use the helper functions which convert to str.
This commit is contained in:
Kurt B. Kaiser 2011-05-12 15:25:24 -04:00
parent e147806da9
commit 0a42982316
3 changed files with 32 additions and 32 deletions

View File

@ -309,17 +309,20 @@ class IOBinding:
return "yes" return "yes"
message = "Do you want to save %s before closing?" % ( message = "Do you want to save %s before closing?" % (
self.filename or "this untitled document") self.filename or "this untitled document")
m = tkMessageBox.Message( confirm = tkMessageBox.askyesnocancel(
title="Save On Close", title="Save On Close",
message=message, message=message,
icon=tkMessageBox.QUESTION, default=tkMessageBox.YES,
type=tkMessageBox.YESNOCANCEL,
master=self.text) master=self.text)
reply = m.show() if confirm:
if reply == "yes": reply = "yes"
self.save(None) self.save(None)
if not self.get_saved(): if not self.get_saved():
reply = "cancel" reply = "cancel"
elif confirm is None:
reply = "cancel"
else:
reply = "no"
self.text.focus_set() self.text.focus_set()
return reply return reply
@ -328,7 +331,7 @@ class IOBinding:
self.save_as(event) self.save_as(event)
else: else:
if self.writefile(self.filename): if self.writefile(self.filename):
self.set_saved(1) self.set_saved(True)
try: try:
self.editwin.store_file_breaks() self.editwin.store_file_breaks()
except AttributeError: # may be a PyShell except AttributeError: # may be a PyShell
@ -420,15 +423,12 @@ class IOBinding:
self.text.insert("end-1c", "\n") self.text.insert("end-1c", "\n")
def print_window(self, event): def print_window(self, event):
m = tkMessageBox.Message( confirm = tkMessageBox.askokcancel(
title="Print", title="Print",
message="Print to Default Printer", message="Print to Default Printer",
icon=tkMessageBox.QUESTION,
type=tkMessageBox.OKCANCEL,
default=tkMessageBox.OK, default=tkMessageBox.OK,
master=self.text) master=self.text)
reply = m.show() if not confirm:
if reply != tkMessageBox.OK:
self.text.focus_set() self.text.focus_set()
return "break" return "break"
tempfilename = None tempfilename = None
@ -444,7 +444,7 @@ class IOBinding:
os.unlink(tempfilename) os.unlink(tempfilename)
return "break" return "break"
platform = os.name platform = os.name
printPlatform=1 printPlatform = True
if platform == 'posix': #posix platform if platform == 'posix': #posix platform
command = idleConf.GetOption('main','General', command = idleConf.GetOption('main','General',
'print-command-posix') 'print-command-posix')
@ -452,7 +452,7 @@ class IOBinding:
elif platform == 'nt': #win32 platform elif platform == 'nt': #win32 platform
command = idleConf.GetOption('main','General','print-command-win') command = idleConf.GetOption('main','General','print-command-win')
else: #no printing for this platform else: #no printing for this platform
printPlatform=0 printPlatform = False
if printPlatform: #we can try to print for this platform if printPlatform: #we can try to print for this platform
command = command % filename command = command % filename
pipe = os.popen(command, "r") pipe = os.popen(command, "r")

View File

@ -1,7 +1,9 @@
What's New in IDLE 3.1.4? What's New in IDLE 3.1.4?
========================= =========================
*Release date: 15-May-11* *Release date: XX-XXX-11*
- Issue #11896: Save on Close failed despite selecting "Yes" in dialog.
- Issue #1028: Ctrl-space binding to show completions was causing IDLE to exit. - Issue #1028: Ctrl-space binding to show completions was causing IDLE to exit.
Tk < 8.5 was sending invalid Unicode null; replaced with valid null. Tk < 8.5 was sending invalid Unicode null; replaced with valid null.

View File

@ -174,9 +174,9 @@ class ScriptBinding:
if autosave and filename: if autosave and filename:
self.editwin.io.save(None) self.editwin.io.save(None)
else: else:
reply = self.ask_save_dialog() confirm = self.ask_save_dialog()
self.editwin.text.focus_set() self.editwin.text.focus_set()
if reply == "ok": if confirm:
self.editwin.io.save(None) self.editwin.io.save(None)
filename = self.editwin.io.filename filename = self.editwin.io.filename
else: else:
@ -185,13 +185,11 @@ class ScriptBinding:
def ask_save_dialog(self): def ask_save_dialog(self):
msg = "Source Must Be Saved\n" + 5*' ' + "OK to Save?" msg = "Source Must Be Saved\n" + 5*' ' + "OK to Save?"
mb = tkMessageBox.Message(title="Save Before Run or Check", confirm = tkMessageBox.askokcancel(title="Save Before Run or Check",
message=msg, message=msg,
icon=tkMessageBox.QUESTION,
type=tkMessageBox.OKCANCEL,
default=tkMessageBox.OK, default=tkMessageBox.OK,
master=self.editwin.text) master=self.editwin.text)
return mb.show() return confirm
def errorbox(self, title, message): def errorbox(self, title, message):
# XXX This should really be a function of EditorWindow... # XXX This should really be a function of EditorWindow...