merge with 3.3

.hgtags

@@ -99,6 +99,8 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
 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
@@ -109,3 +111,5 @@ e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
 bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
+92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
+d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1

Doc/howto/logging-cookbook.rst

@@ -1631,7 +1631,7 @@ UTF-8, then you need to do the following:
 
       'ASCII section\ufeffUnicode section'
 
-   The Unicode code point ``'\ufeff'``, when encoded using UTF-8, will be
+   The Unicode code point U+FEFF, when encoded using UTF-8, will be
    encoded as a UTF-8 BOM -- the byte-string ``b'\xef\xbb\xbf'``.
 
 #. Replace the ASCII section with whatever placeholders you like, but make sure

Doc/library/concurrent.futures.rst

@@ -144,7 +144,7 @@ ThreadPoolExecutor Example
    # We can use a with statement to ensure threads are cleaned up promptly
    with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
        # Start the load operations and mark each future with its URL
-       future_to_url = {executor.submit(load_url, url, 60):url for url in URLS}
+       future_to_url = {executor.submit(load_url, url, 60): url for url in URLS}
        for future in concurrent.futures.as_completed(future_to_url):
            url = future_to_url[future]
            try:

Doc/license.rst

@@ -120,6 +120,8 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+------------+------------+-----------------+
 | 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             |
 +----------------+--------------+------------+------------+-----------------+
 | 3.4.0          | 3.3.0        | 2014       | PSF        | yes             |

LICENSE

@@ -74,6 +74,7 @@ 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
     3.4.0           3.3.0       2014        PSF         yes
 

Lib/idlelib/NEWS.txt

@@ -6,6 +6,8 @@ What's New in IDLE 3.4.0?
 
 - Issue #5066: Update IDLE docs. Patch by Todd Rovito.
 
+- Issue #17625: Close the replace dialog after it is used.
+
 - Issue #16226: Fix IDLE Path Browser crash.
   (Patch by Roger Serwy)
 
@@ -16,6 +18,8 @@ What's New in IDLE 3.4.0?
 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.
@@ -872,7 +876,3 @@ What's New in IDLEfork 0.9 Alpha 1?
 Refer to HISTORY.txt for additional information on earlier releases.
 --------------------------------------------------------------------
 
-
-
-
-

PC/python_nt.rc

@@ -61,7 +61,7 @@ BEGIN
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
-            VALUE "LegalCopyright", "Copyright  2001-2012 Python Software Foundation. Copyright  2000 BeOpen.com. Copyright  1995-2001 CNRI. Copyright  1991-1995 SMC.\0"
+            VALUE "LegalCopyright", "Copyright  2001-2013 Python Software Foundation. Copyright  2000 BeOpen.com. Copyright  1995-2001 CNRI. Copyright  1991-1995 SMC.\0"
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION

README

@@ -167,8 +167,8 @@ See PEP 398 for release details: http://www.python.org/dev/peps/pep-0398/
 Copyright and License Information
 ---------------------------------
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Python Software Foundation.  All rights reserved.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Python Software Foundation.  All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.  All rights reserved.