From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 May 2011 21:06:00 +0000 (-0500)
Subject: bump to 3.1.4rc1
X-Git-Tag: v3.1.4rc1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a63745273522db31d6dea5a45db38d2af5fef55;p=thirdparty%2FPython%2Fcpython.git

bump to 3.1.4rc1
---

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 58a79fef7fdd..db58c5fc6009 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	1
-#define PY_MICRO_VERSION	3
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
+#define PY_MICRO_VERSION	4
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION      	"3.1.3+"
+#define PY_VERSION      	"3.1.4rc1"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 6f55f016a2db..5f8425fb1d59 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@ __revision__ = "$Id$"
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.3"
+__version__ = "3.1.4rc1"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 8ee61a2cd38b..fa89048a0087 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.1.3"
+IDLE_VERSION = "3.1.4rc1"
diff --git a/Misc/NEWS b/Misc/NEWS
index f04c6436681a..3982b2bdd70e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,10 +2,10 @@
 Python News
 +++++++++++
 
-What's New in Python 3.1.4?
-===========================
+What's New in Python 3.1.4 release candidate 1?
+===============================================
 
-*Release date: XXXX-XX-XX*
+*Release date: 2011-05-29*
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.1.spec
index 0f24a4176225..d3c9bf23b7f1 100644
--- a/Misc/RPM/python-3.1.spec
+++ b/Misc/RPM/python-3.1.spec
@@ -34,7 +34,7 @@
 
 %define name python
 #--start constants--
-%define version 3.1.3
+%define version 3.1.4rc1
 %define libvers 3.1
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
index a59cb91360dc..b136247d6aa6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.1.3
+This is Python version 3.1.4
 ============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010