[Python-checkins] cpython (merge 2.7 -> 2.7): merge from 2.7 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/c4e0dfbc9f48
changeset:   75703:c4e0dfbc9f48
branch:      2.7
parent:      75689:1559a82a3529
parent:      75702:32d54230e010
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Mar 15 13:01:04 2012 -0500
summary:
  merge from 2.7 release branch

files:
  .hgtags                   |  1 +
  Include/patchlevel.h      |  4 ++--
  Lib/distutils/__init__.py |  2 +-
  Lib/idlelib/idlever.py    |  2 +-
  Misc/NEWS                 |  2 +-
  Misc/RPM/python-2.7.spec  |  2 +-
  6 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -151,3 +151,4 @@
 f48756685406e8d0fa9d23d841fceb07e36a5656 v2.7.2rc1
 8527427914a29d895bcb30be76a465143993a793 v2.7.2
 b2c6aff96e1251a4f03cf866e7e75fb8232869f2 v2.7.3rc1
+d46c1973d3c407ecaa6a8ee16d3fad3ef506b51f v2.7.3rc2
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -24,10 +24,10 @@
 #define PY_MINOR_VERSION	7
 #define PY_MICRO_VERSION	3
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"2.7.3rc1"
+#define PY_VERSION      	"2.7.3rc2"
 /*--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
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.3rc1"
+__version__ = "2.7.3rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "2.7.3rc1"
+IDLE_VERSION = "2.7.3rc2"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,7 +45,7 @@
 What's New in Python 2.7.3 release candidate 2?
 ===============================================
 
-*Release date: 2012-03-XX*
+*Release date: 2012-03-17*
 
 Library
 -------
diff --git a/Misc/RPM/python-2.7.spec b/Misc/RPM/python-2.7.spec
--- a/Misc/RPM/python-2.7.spec
+++ b/Misc/RPM/python-2.7.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.7.3rc1
+%define version 2.7.3rc2
 %define libvers 2.7
 #--end constants--
 %define release 1pydotorg

-- 
Repository URL: http://hg.python.org/cpython