From: Georg Brandl <georg@python.org>
Date: Sat, 6 Apr 2013 14:39:49 +0000 (+0200)
Subject: merge with 3.2 branch
X-Git-Tag: v3.3.2~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fd4abe6a1f54fe7a5409abf84060bae47a52044;p=python

merge with 3.2 branch
---

2fd4abe6a1f54fe7a5409abf84060bae47a52044
diff --cc .hgtags
index efa4d2ecb7,a9c7696e27..91c4156f67
--- a/.hgtags
+++ b/.hgtags
@@@ -99,13 -99,5 +99,15 @@@ c860feaa348d663e598986894ee4680480577e1
  7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
  428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
  3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
+ b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
+ 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
 +f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 +2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 +0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3
 +7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4
 +e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 +4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 +8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 +88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 +c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
 +bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
diff --cc Doc/license.rst
index 5b7fcbd2c4,a3257f87d4..9e80f5dbaa
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@@ -120,8 -120,8 +120,10 @@@ been GPL-compatible; the table below su
  +----------------+--------------+------------+------------+-----------------+
  | 3.2.3          | 3.2.2        | 2012       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
+ | 3.2.4          | 3.2.3        | 2013       | PSF        | yes             |
+ +----------------+--------------+------------+------------+-----------------+
 +| 3.3.0          | 3.2          | 2012       | PSF        | yes             |
 ++----------------+--------------+------------+------------+-----------------+
  
  .. note::
  
diff --cc LICENSE
index dd7044e768,b9e3927481..2d565c921c
--- a/LICENSE
+++ b/LICENSE
@@@ -74,7 -74,7 +74,8 @@@ the various releases
      3.2.1           3.2         2011        PSF         yes
      3.2.2           3.2.1       2011        PSF         yes
      3.2.3           3.2.2       2012        PSF         yes
+     3.2.4           3.2.3       2013        PSF         yes
 +    3.3.0           3.2         2012        PSF         yes
  
  Footnotes:
  
diff --cc Lib/idlelib/NEWS.txt
index 0885709111,87c099fea8..748a97b34a
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,23 -1,8 +1,25 @@@
 -What's New in IDLE 3.2.4?
 +What's New in IDLE 3.3.2?
 +=========================
 +
 +- Issue #17390: Display Python version on Idle title bar.
 +  Initial patch by Edmond Burnett.
 +
 +
 +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 #17625: Close the replace dialog after it is used.
+ 
  - Issue #7163: Propagate return value of sys.stdout.write.
  
  - Issue #15318: Prevent writing to sys.stdin.