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 37b7b517c510cb5c612bdb3f84ad1f49b7c0fa9f..c42b29d55b9a78a3ec5b4f8361977380cb8eec7e 100644 (file)
--- 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 5f0acc3c4aa718c2fc212c4e6d60c4ada68a36e2..445536df66b61c4707098b5c6529ccba883866c1 100644 (file)
--- 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.