merge with 3.3.5 release repo

birkenfeld · birkenfeld · commit 5e572fd490c6 · 2014-03-09T11:17:23.000+01:00
diff --git a/.hgtags b/.hgtags
@@ -121,3 +121,5 @@ c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
 9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
+ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
+62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	5
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	2
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.5rc2"
+#define PY_VERSION      	"3.3.5+"
 /*--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
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.5rc2"
+__version__ = "3.3.5"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.3.5rc2"
+IDLE_VERSION = "3.3.5"
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -2,6 +2,30 @@
 Python News
 +++++++++++
 
+What's New in Python 3.3.6 release candidate 1?
+===============================================
+
+*Release date: XX-XXX-XXXX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+- Issue #20283: RE pattern methods now accept the string keyword parameters
+  as documented.  The pattern and source keyword parameters are left as
+  deprecated aliases.
+
+
+What's New in Python 3.3.5?
+===========================
+
+*Release date: 09-Mar-2014*
+
+No changes from release candidate 2.
+
+
 What's New in Python 3.3.5 release candidate 2?
 ===============================================
 
@@ -22,10 +46,6 @@ Core and Builtins
 Library
 -------
 
-- Issue #20283: RE pattern methods now accept the string keyword parameters
-  as documented.  The pattern and source keyword parameters are left as
-  deprecated aliases.
-
 - Issue #20778: Fix modulefinder to work with bytecode-only modules.
 
 - Issue #20791: copy.copy() now doesn't make a copy when the input is
diff --git 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.5rc2
+%define version 3.3.5
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
@@ -1,5 +1,5 @@
-This is Python version 3.3.5 release candidate 2
-================================================
+This is Python version 3.3.5
+============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012, 2013, 2014 Python Software Foundation.  All rights reserved.

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`# Updated automatically by the Python release process.`
`14`	`14`	`#`
`15`	`15`	`#--start constants--`
`16`		`-__version__ = "3.3.5rc2"`
	`16`	`+__version__ = "3.3.5"`
`17`	`17`	`#--end constants--`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDLE_VERSION = "3.3.5rc2"`
	`1`	`+IDLE_VERSION = "3.3.5"`