[Python-checkins] cpython (2.7): Issue #25173: Replace 'master' with 'parent' in tkinter.messagebox calls.
terry.reedy
python-checkins at python.org
Sat Sep 26 04:23:54 CEST 2015
https://hg.python.org/cpython/rev/e406d62014f7
changeset: 98269:e406d62014f7
branch: 2.7
parent: 98261:c1eccae07977
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Sep 25 22:22:48 2015 -0400
summary:
Issue #25173: Replace 'master' with 'parent' in tkinter.messagebox calls.
This associates the message box with the widget and is better for Mac OSX.
Patch by Mark Roseman.
files:
Lib/idlelib/IOBinding.py | 22 +++++++++++-----------
Lib/idlelib/OutputWindow.py | 2 +-
Lib/idlelib/PyShell.py | 12 ++++++------
Lib/idlelib/ScriptBinding.py | 4 ++--
Lib/idlelib/run.py | 2 +-
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -250,7 +250,7 @@
with open(filename, 'rb') as f:
chars = f.read()
except IOError as msg:
- tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
+ tkMessageBox.showerror("I/O Error", str(msg), parent=self.text)
return False
chars = self.decode(chars)
@@ -297,7 +297,7 @@
title="Error loading the file",
message="The encoding '%s' is not known to this Python "\
"installation. The file may not display correctly" % name,
- master = self.text)
+ parent = self.text)
enc = None
if enc:
try:
@@ -327,7 +327,7 @@
title="Save On Close",
message=message,
default=tkMessageBox.YES,
- master=self.text)
+ parent=self.text)
if confirm:
reply = "yes"
self.save(None)
@@ -386,7 +386,7 @@
return True
except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg),
- master=self.text)
+ parent=self.text)
return False
def encode(self, chars):
@@ -416,7 +416,7 @@
tkMessageBox.showerror(
"I/O Error",
"%s. Saving as UTF-8" % failed,
- master = self.text)
+ parent = self.text)
# If there was a UTF-8 signature, use that. This should not fail
if self.fileencoding == BOM_UTF8 or failed:
return BOM_UTF8 + chars.encode("utf-8")
@@ -429,7 +429,7 @@
"I/O Error",
"Cannot save this as '%s' anymore. Saving as UTF-8" \
% self.fileencoding,
- master = self.text)
+ parent = self.text)
return BOM_UTF8 + chars.encode("utf-8")
# Nothing was declared, and we had not determined an encoding
# on loading. Recommend an encoding line.
@@ -473,7 +473,7 @@
title="Print",
message="Print to Default Printer",
default=tkMessageBox.OK,
- master=self.text)
+ parent=self.text)
if not confirm:
self.text.focus_set()
return "break"
@@ -510,10 +510,10 @@
status + output
if output:
output = "Printing command: %s\n" % repr(command) + output
- tkMessageBox.showerror("Print status", output, master=self.text)
+ tkMessageBox.showerror("Print status", output, parent=self.text)
else: #no printing for this platform
message = "Printing is not enabled for this platform: %s" % platform
- tkMessageBox.showinfo("Print status", message, master=self.text)
+ tkMessageBox.showinfo("Print status", message, parent=self.text)
if tempfilename:
os.unlink(tempfilename)
return "break"
@@ -532,7 +532,7 @@
def askopenfile(self):
dir, base = self.defaultfilename("open")
if not self.opendialog:
- self.opendialog = tkFileDialog.Open(master=self.text,
+ self.opendialog = tkFileDialog.Open(parent=self.text,
filetypes=self.filetypes)
filename = self.opendialog.show(initialdir=dir, initialfile=base)
if isinstance(filename, unicode):
@@ -555,7 +555,7 @@
dir, base = self.defaultfilename("save")
if not self.savedialog:
self.savedialog = tkFileDialog.SaveAs(
- master=self.text,
+ parent=self.text,
filetypes=self.filetypes,
defaultextension=self.defaultextension)
filename = self.savedialog.show(initialdir=dir, initialfile=base)
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -96,7 +96,7 @@
"No special line",
"The line you point at doesn't look like "
"a valid file name followed by a line number.",
- master=self.text)
+ parent=self.text)
return
filename, lineno = result
edit = self.flist.open(filename)
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -799,7 +799,7 @@
"Exit?",
"Do you want to exit altogether?",
default="yes",
- master=self.tkconsole.text):
+ parent=self.tkconsole.text):
raise
else:
self.showtraceback()
@@ -837,7 +837,7 @@
"Run IDLE with the -n command line switch to start without a "
"subprocess and refer to Help/IDLE Help 'Running without a "
"subprocess' for further details.",
- master=self.tkconsole.text)
+ parent=self.tkconsole.text)
def display_no_subprocess_error(self):
tkMessageBox.showerror(
@@ -845,14 +845,14 @@
"IDLE's subprocess didn't make connection. Either IDLE can't "
"start a subprocess or personal firewall software is blocking "
"the connection.",
- master=self.tkconsole.text)
+ parent=self.tkconsole.text)
def display_executing_dialog(self):
tkMessageBox.showerror(
"Already executing",
"The Python Shell window is already executing a command; "
"please wait until it is finished.",
- master=self.tkconsole.text)
+ parent=self.tkconsole.text)
class PyShell(OutputWindow):
@@ -948,7 +948,7 @@
if self.executing:
tkMessageBox.showerror("Don't debug now",
"You can only toggle the debugger when idle",
- master=self.text)
+ parent=self.text)
self.set_debugger_indicator()
return "break"
else:
@@ -1256,7 +1256,7 @@
tkMessageBox.showerror("No stack trace",
"There is no stack trace yet.\n"
"(sys.last_traceback is not defined)",
- master=self.text)
+ parent=self.text)
return
from idlelib.StackViewer import StackBrowser
StackBrowser(self.root, self.flist)
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -213,10 +213,10 @@
confirm = tkMessageBox.askokcancel(title="Save Before Run or Check",
message=msg,
default=tkMessageBox.OK,
- master=self.editwin.text)
+ parent=self.editwin.text)
return confirm
def errorbox(self, title, message):
# XXX This should really be a function of EditorWindow...
- tkMessageBox.showerror(title, message, master=self.editwin.text)
+ tkMessageBox.showerror(title, message, parent=self.editwin.text)
self.editwin.text.focus_set()
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -164,7 +164,7 @@
tkMessageBox.showerror("IDLE Subprocess Error", msg, parent=root)
else:
tkMessageBox.showerror("IDLE Subprocess Error",
- "Socket Error: %s" % err.args[1])
+ "Socket Error: %s" % err.args[1], parent=root)
root.destroy()
def print_exception():
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list