[Python-checkins] cpython (merge 3.3 -> 3.3): merge 3.3.5rc1 release commits with 3.3 branch

Sun Mar 2 09:22:57 CET 2014

http://hg.python.org/cpython/rev/e56522b1c42d
changeset: 89455:e56522b1c42d
branch: 3.3
parent: 89448:406851b1814c
parent: 89454:7118f103c593
user: Georg Brandl <georg at python.org>
date: Sun Mar 02 08:54:15 2014 +0100
summary:
 merge 3.3.5rc1 release commits with 3.3 branch
files:
 .hgtags | 1 +
 Include/patchlevel.h | 8 ++++----
 Lib/distutils/__init__.py | 2 +-
 Lib/idlelib/idlever.py | 2 +-
 Lib/test/test_robotparser.py | 1 +
 Misc/NEWS | 2 +-
 Misc/RPM/python-3.3.spec | 2 +-
 README | 4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -120,3 +120,4 @@
 c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
+9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	3
-#define PY_MICRO_VERSION	4
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
+#define PY_MICRO_VERSION	5
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION 	"3.3.4+"
+#define PY_VERSION 	"3.3.5rc1"
 /*--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
--- 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.4"
+__version__ = "3.3.5rc1"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.4"
+IDLE_VERSION = "3.3.5rc1"
diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py
--- a/Lib/test/test_robotparser.py
+++ b/Lib/test/test_robotparser.py
@@ -275,6 +275,7 @@
 self.skipTest('%s is unavailable' % url)
 self.assertEqual(parser.can_fetch("*", robots_url), False)
 
+ @unittest.skip('does not handle the gzip encoding delivered by pydotorg')
 def testPythonOrg(self):
 support.requires('network')
 with support.transient_internet('www.python.org'):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@
 What's New in Python 3.3.5 release candidate 1?
 ===============================================
 
-*Release date: XXXX-XX-XX*
+*Release date: 23-Feb-2014*
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- 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.4
+%define version 3.3.5rc1
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.3.4
-============================
+This is Python version 3.3.5 release candidate 1
+================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012, 2013, 2014 Python Software Foundation. All rights reserved.
-- 
Repository URL: http://hg.python.org/cpython
