summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-05-28 11:58:36 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-05-28 11:58:36 (GMT)
commit11a859d70dffc8da51d346dabd1fe6a635825ae5 (patch)
tree253910e2a0811d6cb4848049a465fd0289918e48
parente81c485e5778b1dd628f4bf0f5aecd16d02f91df (diff)
downloadcpython-11a859d70dffc8da51d346dabd1fe6a635825ae5.zip
cpython-11a859d70dffc8da51d346dabd1fe6a635825ae5.tar.gz
cpython-11a859d70dffc8da51d346dabd1fe6a635825ae5.tar.bz2
r88840: Prepare for 2.5.6.v2.5.6
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Lib/idlelib/NEWS.txt5
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/NEWS6
-rw-r--r--README4
5 files changed, 17 insertions, 6 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index f1e513c..0cefd6e 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -22,11 +22,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 5
#define PY_MICRO_VERSION 6
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "2.5.6c1"
+#define PY_VERSION "2.5.6"
/* Subversion Revision number of this file (not of the repository) */
#define PY_PATCHLEVEL_REVISION "$Revision$"
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 7497108..562929a 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,8 @@
+What's New in IDLE 1.2.6?
+=========================
+
+*Release date: 26-May-2011*
+
What's New in IDLE 1.2.6c1?
===========================
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 1dd637c..40604e5 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.2.6c1"
+IDLE_VERSION = "1.2.6"
diff --git a/Misc/NEWS b/Misc/NEWS
index 96fd36b..d15f30a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,12 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.5.6?
+===========================
+
+*Release date: 26-May-2011*
+
+
What's New in Python 2.5.6c1?
=============================
diff --git a/README b/README
index 0fd2f5d..a1e1801 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 2.5.6c1
-==============================
+This is Python version 2.5.6
+============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Python Software Foundation. All rights reserved.