Merge in changes from 3.3.0rc2 release clone.

7 files changed, 36 insertions, 17 deletions

diff --git a/.hgtags b/.hgtags
index 3f69794..3df57b7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -106,3 +106,4 @@ f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
+88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 601b472..ba0b566 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc1+"
+#define PY_VERSION      	"3.3.0rc2+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8d73b51..f23d886 100644
--- a/Lib/distutils/__init__.py
+++ b/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.0rc1"
+__version__ = "3.3.0rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 4a65a88..b73ce75 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.3.0rc1"
+IDLE_VERSION = "3.3.0rc2"
diff --git a/Misc/NEWS b/Misc/NEWS
index b961f9f..0db3e09 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,6 @@ What's New in Python 3.3.1
 Core and Builtins
 -----------------
 
-- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
-  sporadic crashes in multi-thread programs when several long deallocator
-  chains ran concurrently and involved subclasses of built-in container
-  types.
-
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
@@ -62,9 +57,6 @@ Build
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
-- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
-  (replaces fixes for Issue #15645).
-
 Documentation
 -------------
 
@@ -75,14 +67,31 @@ Tools/Demos
 -----------
 
 
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
-*Release date: XX-Sep-2012*
+*Release date: 09-Sep-2012*
 
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15784: Modify OSError.__str__() to better distinguish between
   errno error numbers and Windows error numbers.
 
@@ -91,11 +100,14 @@ Core and Builtins
 Library
 -------
 
+- Issue #15847: Fix a regression in argparse, which did not accept tuples
+  as argument lists anymore.
+
+- Issue #15828: Restore support for C extensions in imp.load_module().
+
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 
-- Issue #15828: Restore support for C extensions in imp.load_module()
-
 - Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize()
   method.
 
@@ -111,6 +123,12 @@ Library
   calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
   to libncursesw.
 
+Build
+-----
+
+- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
+  (replaces fixes for Issue #15645).
+
 Documentation
 -------------
 
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
index 94354f9..ab21f96 100644
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc1
+%define version 3.3.0rc2
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
index 3f0f149..81f0d20 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 1
+This is Python version 3.3.0 release candidate 2
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,