summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2008-04-03 04:10:02 (GMT)
committerBarry Warsaw <barry@python.org>2008-04-03 04:10:02 (GMT)
commit9649cdd5d4b947fd7356f1c2946509b8a520647d (patch)
tree38ae02f168a2d11f88905d0754036452959f47ed
parentb23550049d2e8f58fdbe5ba40df7c962f183c337 (diff)
downloadcpython-9649cdd5d4b947fd7356f1c2946509b8a520647d.zip
cpython-9649cdd5d4b947fd7356f1c2946509b8a520647d.tar.gz
cpython-9649cdd5d4b947fd7356f1c2946509b8a520647d.tar.bz2
Updating for 2.6a2v2.6a2
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Lib/distutils/__init__.py5
-rw-r--r--Lib/idlelib/idlever.py2
-rw-r--r--Misc/RPM/python-2.6.spec6
-rw-r--r--README2
5 files changed, 14 insertions, 7 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index e5b8a2f..ff618f1 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,14 +19,16 @@
/* Higher for patch releases */
/* Version parsed out into numeric values */
+/*--start constants--*/
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 6
#define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "2.6a1+"
+#define PY_VERSION "2.6a2"
+/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */
#define PY_PATCHLEVEL_REVISION "$Revision$"
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8c954c2..d0dd03a 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -20,4 +20,7 @@ __revision__ = "$Id$"
# In general, major and minor version should loosely follow the Python
# version number the distutils code was shipped with.
#
-__version__ = "2.6.0"
+
+#--start constants--
+__version__ = "2.6a2"
+#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 76cf619..308e33f 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "2.6a1"
+IDLE_VERSION = "2.6a2"
diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec
index 73eba56..b7f7241 100644
--- a/Misc/RPM/python-2.6.spec
+++ b/Misc/RPM/python-2.6.spec
@@ -33,8 +33,10 @@
#################################
%define name python
-%define version 2.6a1
-%define libvers 2.6
+#--start constants--
+%define version 2.6a2
+%define libver 2.6
+#--end constants--
%define release 1pydotorg
%define __prefix /usr
diff --git a/README b/README
index 2ae630f..5523ad8 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 2.6 alpha 1
+This is Python version 2.6 alpha 2
==================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008