merge with 3.3.1 release clone

.hgtags

@@ -111,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/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:

Include/patchlevel.h

@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	3
-#define PY_MICRO_VERSION	0
+#define PY_MICRO_VERSION	1
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0+"
+#define PY_VERSION      	"3.3.1"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/distutils/__init__.py

@@ -13,5 +13,5 @@ used from a setup script as
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0"
+__version__ = "3.3.1"
 #--end constants--

Lib/idlelib/NEWS.txt

@@ -8,6 +8,8 @@ What's New in IDLE 3.3.2?
 What's New in IDLE 3.3.1?
 =========================
 
+- Issue #17625: Close the replace dialog after it is used.
+
 - Issue #16226: Fix IDLE Path Browser crash.
   (Patch by Roger Serwy)
 

Lib/idlelib/idlever.py

-IDLE_VERSION = "3.3.0"
+IDLE_VERSION = "3.3.1"

Misc/NEWS

@@ -5,9 +5,9 @@ Python News
 What's New in Python 3.3.2?
 ===========================
 
-*Release date: XXXX-XX-XX*
+.. *Release date: XXXX-XX-XX*
 
-*Not yet released, see sections below for changes released in 3.3.0*
+*Not yet released, see sections below for changes released in 3.3.1*
 
 Core and Builtins
 -----------------
@@ -54,6 +54,22 @@ What's New in Python 3.3.1?
 
 *Release date: 07-Apr-2013*
 
+Build
+-----
+
+- Issue #17550: Fix the --enable-profiling configure switch.
+
+Library
+-------
+
+- Issue #17625: In IDLE, close the replace dialog after it is used.
+
+
+What's New in Python 3.3.1 release candidate 1?
+===============================================
+
+*Release date: 24-Mar-2013*
+
 Core and Builtins
 -----------------
 
@@ -1246,7 +1262,7 @@ Documentation
 - Create a 'Concurrent Execution' section in the docs, and split up the
   'Optional Operating System Services' section to use a more user-centric
   classification scheme (splitting them across the new CE section, IPC and text
-  processing). Operating system limitatons can be reflected with the Sphinx
+  processing). Operating system limitations can be reflected with the Sphinx
   ``:platform:`` tag, it doesn't make sense as part of the Table of Contents.
 
 - Issue #4966: Bring the sequence docs up to date for the Py3k transition and
@@ -3454,7 +3470,7 @@ Library
 - Issue #13589: Fix some serialization primitives in the aifc module.
   Patch by Oleg Plakhotnyuk.
 
-- Issue #13642: Unquote before b64encoding user:password during Basic
+- Issue #13642: Unquote before b64encoding ``user:password`` during Basic
   Authentication. Patch contributed by Joonas Kuorilehto.
 
 - Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow
@@ -3938,8 +3954,8 @@ Library
 - Issue #12590: IDLE editor window now always displays the first line
   when opening a long file.  With Tk 8.5, the first line was hidden.
 
-- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates)
-  Connection:close header.
+- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscate)
+  a ``Connection: close`` header.
 
 - Issue #12102: Document that buffered files must be flushed before being used
   with mmap. Patch by Steffen Daode Nurpmeso.
@@ -4265,7 +4281,7 @@ Library
   Patch by John O'Connor.
 
 - Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
-  With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
+  With Tk < 8.5, PythonCmd() in _tkinter.c raised UnicodeDecodeError, caused
   IDLE to exit.  Converted to valid Unicode null in PythonCmd().
 
 - Issue #11799: urllib.request Authentication Handlers will raise a ValueError
@@ -4544,7 +4560,7 @@ Library
 
 - Issue #11127: Raise a TypeError when trying to pickle a socket object.
 
-- Issue #11563: Connection:close header is sent by requests using URLOpener
+- Issue #11563: ``Connection: close`` header is sent by requests using URLOpener
   class which helps in closing of sockets after connection is over. Patch
   contributions by Jeff McNeil and Nadeem Vawda.
 
@@ -5052,7 +5068,7 @@ Tests
 - Issue #11505: improves test coverage of string.py. Patch by Alicia
   Arlen
 
-- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
+- Issue #11490: test_subprocess.test_leaking_fds_on_error no longer gives a
   false positive if the last directory in the path is inaccessible.
 
 - Issue #11223: Fix test_threadsignals to fail, not hang, when the

Misc/RPM/python-3.3.spec

@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0
+%define version 3.3.1
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg

README

-This is Python version 3.3.0
+This is Python version 3.3.1
 ============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,