From: Ned Deily <nad@acm.org>
Date: Sat, 29 Jan 2011 23:34:19 +0000 (+0000)
Subject: Merged revisions 88234 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a8e21a6ec44cd92c53b25b105be2f0243fbd269;p=thirdparty%2FPython%2Fcpython.git

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)
........
---

diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index 37b7b517c510..c42b29d55b9a 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()
diff --git a/Misc/NEWS b/Misc/NEWS
index 5f0acc3c4aa7..445536df66b6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,10 @@ Core and Builtins
 Library
 -------
 
+- 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.
+
 - Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save
   commands.