summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-06 17:17:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-06 17:17:25 (GMT)
commitc37a4fdf5472b9460cc38885342ef59bce05753f (patch)
treee30c3342ef4bb626f67837ad58c596dce434f2f5
parentd6c75b5a03fc98cf351dc6747bf9f676fb41a435 (diff)
downloadcpython-c37a4fdf5472b9460cc38885342ef59bce05753f.zip
cpython-c37a4fdf5472b9460cc38885342ef59bce05753f.tar.gz
cpython-c37a4fdf5472b9460cc38885342ef59bce05753f.tar.bz2
bump to 3.1.5 finalv3.1.5
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Lib/distutils/__init__.py2
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--Misc/RPM/python-3.1.spec2
5 files changed, 7 insertions, 7 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 0bfb782..7d88be0 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 1
#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.1.5rc2"
+#define PY_VERSION "3.1.5"
/*--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 6ab1662..d79bfa1 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.5rc2"
+__version__ = "3.1.5"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 09d42d4..5e3095b 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.1.5rc2"
+IDLE_VERSION = "3.1.5"
diff --git a/Misc/NEWS b/Misc/NEWS
index 935b067..1b48772 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@ Python News
What's New in Python 3.1.5?
===========================
-*Release date: 2012-02-23*
+*Release date: 2012-04-08*
Core and Builtins
-----------------
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.1.spec
index 235da2d..38c1b0c 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.5rc2
+%define version 3.1.5
%define libvers 3.1
#--end constants--
%define release 1pydotorg