summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-01-29 23:34:19 (GMT)
committerNed Deily <nad@acm.org>2011-01-29 23:34:19 (GMT)
commit7a8e21a6ec44cd92c53b25b105be2f0243fbd269 (patch)
treefc4b9a0b4d6bc5133ee354d3ccefabfbaedbfb21 /Lib/idlelib
parent74d31a00d0bef8abea1fb8176771f9dd17dbcd83 (diff)
downloadcpython-7a8e21a6ec44cd92c53b25b105be2f0243fbd269.zip
cpython-7a8e21a6ec44cd92c53b25b105be2f0243fbd269.tar.gz
cpython-7a8e21a6ec44cd92c53b25b105be2f0243fbd269.tar.bz2
Merged revisions 88234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88234 | ned.deily | 2011-01-29 10:43:56 -0800 (Sat, 29 Jan 2011) | 5 lines Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x, preventing a confusing hung appearance on OS X with the windows obscured. (with release manager approval for 3.2rc2) ........
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/ScriptBinding.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index 37b7b51..c42b29d 100644
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -190,10 +190,10 @@ class ScriptBinding:
icon=tkMessageBox.QUESTION,
type=tkMessageBox.OKCANCEL,
default=tkMessageBox.OK,
- parent=self.editwin.text)
+ master=self.editwin.text)
return mb.show()
def errorbox(self, title, message):
# XXX This should really be a function of EditorWindow...
- tkMessageBox.showerror(title, message, parent=self.editwin.text)
+ tkMessageBox.showerror(title, message, master=self.editwin.text)
self.editwin.text.focus_set()