Merge heads

.hgtags

@@ -116,3 +116,5 @@ bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
 d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
 d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
 fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
+d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
+c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3

Doc/library/string.rst

@@ -300,7 +300,7 @@ The general form of a *standard format specifier* is:
    precision: `integer`
    type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
 
-If a valid *align* value is specified, it can be preceeded by a *fill*
+If a valid *align* value is specified, it can be preceded by a *fill*
 character that can be any character and defaults to a space if omitted.
 Note that it is not possible to use ``{`` and ``}`` as *fill* char while
 using the :meth:`str.format` method; this limitation however doesn't

Include/patchlevel.h

@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	3
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.3rc1"
+#define PY_VERSION      	"3.3.3+"
 /*--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.3rc1"
+__version__ = "3.3.3"
 #--end constants--

Lib/idlelib/idlever.py

-IDLE_VERSION = "3.3.3rc1"
+IDLE_VERSION = "3.3.3"

Misc/NEWS

@@ -2,10 +2,10 @@
 Python News
 +++++++++++
 
-What's New in Python 3.3.4?
-===========================
+What's New in Python 3.3.4 release candidate 1?
+===============================================
 
-*Not yet released, see sections below for changes released in 3.3.2*
+*Not yet released, see sections below for changes released in 3.3.3*
 
 Core and Builtins
 -----------------
@@ -42,8 +42,6 @@ Library
 - Issue #19286: Directories in ``package_data`` are no longer added to
   the filelist, preventing failure outlined in the ticket.
 
-- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
-
 Tests
 -----
 
@@ -58,6 +56,36 @@ Tests
 Build
 -----
 
+
+What's New in Python 3.3.3?
+===========================
+
+*Release date: 17-Nov-2013*
+
+No changes from release candidate 2.
+
+
+What's New in Python 3.3.3 release candidate 2?
+===============================================
+
+*Release date: 11-Nov-2013*
+
+Library
+-------
+
+- Issue #19227: Any re-seeding of the OpenSSL RNG on fork has been removed;
+  this should be handled by OpenSSL itself or by the application.
+
+- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
+
+Tests
+-----
+
+- Issue #18964: Fix test_tcl when run with Tcl/Tk versions  < 8.5.
+
+Build
+-----
+
 - Issue #15663: Revert OS X installer built-in Tcl/Tk support for 3.3.3.
   Some third-party projects, such as Matplotlib and PIL/Pillow,
   depended on being able to build with Tcl and Tk frameworks in

Misc/RPM/python-3.3.spec

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

README

-This is Python version 3.3.3 release candidate 1
-================================================
+This is Python version 3.3.3
+============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012, 2013 Python Software Foundation.  All rights reserved.