Merge with 3.3.0 release clone.

7 files changed, 54 insertions, 29 deletions

diff --git a/.hgtags b/.hgtags
index 3df57b7..080b6c6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -107,3 +107,4 @@ e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
+c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index ba0b566..d977d3f 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	2
+#define PY_RELEASE_SERIAL	3
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc2+"
+#define PY_VERSION      	"3.3.0rc3+"
 /*--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 f23d886..b755eaa 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.0rc2"
+__version__ = "3.3.0rc3"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index b73ce75..ff6cb72 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.3.0rc2"
+IDLE_VERSION = "3.3.0rc3"
diff --git a/Misc/NEWS b/Misc/NEWS
index 49d6834..9907a48 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,8 +2,8 @@
 Python News
 +++++++++++
 
-What's New in Python 3.3.1
-==========================
+What's New in Python 3.3.1?
+===========================
 
 *Release date: XX-XX-XXXX*
 
@@ -20,14 +20,6 @@ Core and Builtins
 - Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
   (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
 
-- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
-
-- Issue #15895: Fix FILE pointer leak in one error branch of
-  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
-  is false an and set_main_loader() fails.
-
-- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
-
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
@@ -39,24 +31,16 @@ Core and Builtins
 Library
 -------
 
-- Issue #15925: fixed regression in email.utils.parsedate and parsedate_tz
-  handling of empty and non-date strings.
-
-- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by Cédric Krier.
 
 - Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
   elements 'meta' and 'param'.
 
-- Issue #15842: the SocketIO.{readable,writable,seekable} methods now
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
   raise ValueError when the file-like object is closed.  Patch by Alessandro
   Moura.
 
-- Issue #15882: Change _decimal to accept any coefficient tuple when
-  constructing infinities. This is done for backwards compatibility
-  with decimal.py: Infinity coefficients are undefined in _decimal
-  (in accordance with the specification).
-
 - Issue #15876: Fix a refleak in the curses module: window.encoding.
 
 - Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
@@ -87,9 +71,6 @@ Library
 Extension Modules
 -----------------
 
-- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
-  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
-
 Tests
 -----
 
@@ -130,10 +111,53 @@ Core and Builtins
 Library
 -------
 
+
+What's New in Python 3.3.0 Release Candidate 3?
+===============================================
+
+*Release date: 23-Sep-2012*
+
+Core and Builtins
+-----------------
+
+- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+
+- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
+
+- Issue #15895: Fix FILE pointer leak in one error branch of
+  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
+  is false an and set_main_loader() fails.
+
+- Fixes for a few crash and memory leak regressions found by Coverity.
+
+Library
+-------
+
+- Issue #15882: Change _decimal to accept any coefficient tuple when
+  constructing infinities. This is done for backwards compatibility
+  with decimal.py: Infinity coefficients are undefined in _decimal
+  (in accordance with the specification).
+
+- Issue #15925: Fix a regression in email.util where the parsedate() and
+  parsedate_tz() functions did not return None anymore when the argument could
+  not be parsed.
+
+Extension Modules
+-----------------
+
+- Issue #15973: Fix a segmentation fault when comparing datetime timezone
+  objects.
+
+- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
+  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
+
 - Issue #15969: faulthandler module: rename dump_tracebacks_later() to
   dump_traceback_later() and cancel_dump_tracebacks_later() to
   cancel_dump_traceback_later().
 
+- _decimal module: use only C 89 style comments.
+
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
index ab21f96..ce21695 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.0rc2
+%define version 3.3.0rc3
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
index 81f0d20..19451ab 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 2
+This is Python version 3.3.0 release candidate 3
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,