summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-06 20:28:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-06 20:28:33 (GMT)
commite4b56d2eeec2d8cf77ffac45d94cc63ae1c4b5e4 (patch)
treeceb6bf6d6c6e7f6f9a75bc38d4df01b57ecfd2bd
parentdab886ab0fc719dc990f5d06dc99f7ec41807827 (diff)
downloadcpython-e4b56d2eeec2d8cf77ffac45d94cc63ae1c4b5e4.zip
cpython-e4b56d2eeec2d8cf77ffac45d94cc63ae1c4b5e4.tar.gz
cpython-e4b56d2eeec2d8cf77ffac45d94cc63ae1c4b5e4.tar.bz2
bump to 3.1.2rc1
-rw-r--r--Include/patchlevel.h8
-rw-r--r--Lib/distutils/__init__.py2
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS6
-rw-r--r--Misc/RPM/python-3.1.spec2
-rw-r--r--README4
6 files changed, 12 insertions, 12 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index a15c161..016cf54 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 1
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL 0
+#define PY_MICRO_VERSION 2
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL 1
/* Version as a string */
-#define PY_VERSION "3.1.1+"
+#define PY_VERSION "3.1.2rc1"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8c0e5a3..2e6a6fb 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.1"
+__version__ = "3.1.2rc1"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 43187ce..e14e074 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.1.1"
+IDLE_VERSION = "3.1.2rc1"
diff --git a/Misc/NEWS b/Misc/NEWS
index 03bd4ec..26b8a87 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,10 +4,10 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
-What's New in Python 3.1.2?
-===========================
+What's New in Python 3.1.2 release candidate 1?
+===============================================
-*Release date: 20xx-xx-xx*
+*Release date: 2010-03-06*
Core and Builtins
-----------------
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.1.spec
index 670fdea..482f5a1 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.1
+%define version 3.1.2rc1
%define libver 3.1
#--end constants--
%define release 1pydotorg
diff --git a/README b/README
index 98981d2..4b4444a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.1.1
-============================
+This is Python version 3.1.2 Release Candidate 1
+================================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Python Software Foundation.