[Python-checkins] cpython (2.7): Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu

[ned.deily]

http://hg.python.org/cpython/rev/d089b8fb0f56
changeset:   79897:d089b8fb0f56
branch:      2.7
parent:      79889:1a3f48c6ef16
user:        Ned Deily <nad at acm.org>
date:        Mon Oct 22 15:13:01 2012 -0700
summary:
  Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
with certain versions of Tk 8.5.  Initial patch by Kevin Walzer.

files:
  Lib/idlelib/NEWS.txt        |  3 +++
  Lib/idlelib/configDialog.py |  7 +++----
  2 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -15,6 +15,9 @@
 - Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X
   to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6.
 
+- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
+  with certain versions of Tk 8.5.  Initial patch by Kevin Walzer.
+
 
 What's New in IDLE 2.7.3?
 =========================
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -832,10 +832,9 @@
             fontWeight=tkFont.BOLD
         else:
             fontWeight=tkFont.NORMAL
-        size=self.fontSize.get()
-        self.editFont.config(size=size,
-                weight=fontWeight,family=fontName)
-        self.textHighlightSample.configure(font=(fontName, size, fontWeight))
+        newFont = (fontName, self.fontSize.get(), fontWeight)
+        self.labelFontSample.config(font=newFont)
+        self.textHighlightSample.configure(font=newFont)
 
     def SetHighlightTarget(self):
         if self.highlightTarget.get()=='Cursor': #bg not possible

-- 
Repository URL: http://hg.python.org/cpython