summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2008-10-01 21:46:40 (GMT)
committerBarry Warsaw <barry@python.org>2008-10-01 21:46:40 (GMT)
commitafa14369588b7f0f590bae95bed320a78b8e5add (patch)
tree986c75dfb56722b640525016b540d2dd1adcd0a3
parentd69c904a2f5322069528e8c31f998823787e75f5 (diff)
downloadcpython-afa14369588b7f0f590bae95bed320a78b8e5add.zip
cpython-afa14369588b7f0f590bae95bed320a78b8e5add.tar.gz
cpython-afa14369588b7f0f590bae95bed320a78b8e5add.tar.bz2
Bumping to 2.6 final.
-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-2.6.spec2
-rw-r--r--README4
6 files changed, 9 insertions, 9 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 33e6ae0..2879048 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,11 +23,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 6
#define PY_MICRO_VERSION 0
-#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 "2.6rc2+"
+#define PY_VERSION "2.6"
/*--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 fb8043c..7315a37 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -22,5 +22,5 @@ __revision__ = "$Id$"
#
#--start constants--
-__version__ = "2.6rc2"
+__version__ = "2.6"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 0d7ab6b..1071ada 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "2.6rc2"
+IDLE_VERSION = "2.6"
diff --git a/Misc/NEWS b/Misc/NEWS
index 4993a9c..2d1e099 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -7,7 +7,7 @@ Python News
What's New in Python 2.6 final
==============================
-*Release date: XX-XXX-2008*
+*Release date: 01-Oct-2008*
Core and Builtins
-----------------
diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec
index dda5b60..f878fb2 100644
--- a/Misc/RPM/python-2.6.spec
+++ b/Misc/RPM/python-2.6.spec
@@ -34,7 +34,7 @@
%define name python
#--start constants--
-%define version 2.6rc2
+%define version 2.6
%define libver 2.6
#--end constants--
%define release 1pydotorg
diff --git a/README b/README
index 8f0024a..43f5485 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 2.6 release candidate 2
-==============================================
+This is Python version 2.6
+==========================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Python Software Foundation.