From: Ned Deily <nad@acm.org>
Date: Mon, 22 Oct 2012 22:18:46 +0000 (-0700)
Subject: Issue #15853: merge 3.2 -> 3.3
X-Git-Tag: v3.3.1rc1~757
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6d24d97467d2b4b74017c4812f7173f8021ece3;p=python

Issue #15853: merge 3.2 -> 3.3
---

b6d24d97467d2b4b74017c4812f7173f8021ece3
diff --cc Lib/idlelib/NEWS.txt
index 292c5a0bc9,f234b64b85..f6e8917d20
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,11 -1,4 +1,14 @@@
 -What's New in IDLE 3.2.4?
 +What's New in IDLE 3.3.1?
 +=========================
 +
 +- 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?
  =========================
  
  - Issue #7163: Propagate return value of sys.stdout.write.