[Python-checkins] cpython (merge 3.3 -> default): Issue #15853: merge 3.3 -> default

[ned.deily]

http://hg.python.org/cpython/rev/8f61d580aca6
changeset:   79900:8f61d580aca6
parent:      79896:49de26395d1a
parent:      79899:36e7da8d3059
user:        Ned Deily <nad at acm.org>
date:        Mon Oct 22 15:20:13 2012 -0700
summary:
  Issue #15853: merge 3.3 -> default

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
@@ -4,6 +4,9 @@
 - Issue #16226: Fix IDLE Path Browser crash.
   (Patch by Roger Serwy)
 
+- 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 3.3.0?
 =========================
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -821,10 +821,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