merge 2.7.2 release branch

This commit is contained in:
Benjamin Peterson 2011-06-11 09:51:21 -05:00
commit a573e0df36
7 changed files with 30 additions and 29 deletions

View File

@ -149,3 +149,4 @@ d2e1027edde84a02853fcf9790f311f10f46cf0a v2.7a4
63d9f00fea0730c1c437a50f64a42b7792bdcbfb v2.7.1rc1
5395f96588d4f0199d329cb79eb109648dc4ef5e v2.7.1
f48756685406e8d0fa9d23d841fceb07e36a5656 v2.7.2rc1
8527427914a29d895bcb30be76a465143993a793 v2.7.2

View File

@ -23,11 +23,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 7
#define PY_MICRO_VERSION 2
#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.7.2rc1"
#define PY_VERSION "2.7.2"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository). Empty

View File

@ -15,5 +15,5 @@ __revision__ = "$Id$"
# Updated automatically by the Python release process.
#
#--start constants--
__version__ = "2.7.2rc1"
__version__ = "2.7.2"
#--end constants--

View File

@ -1 +1 @@
IDLE_VERSION = "2.7.2rc1"
IDLE_VERSION = "2.7.2"

File diff suppressed because one or more lines are too long

View File

@ -47,7 +47,7 @@ Tests
What's New in Python 2.7.2?
===========================
*Release date: 2011-06-XX*
*Release date: 2011-06-11*
Library
-------

View File

@ -39,7 +39,7 @@
%define name python
#--start constants--
%define version 2.7.2rc1
%define version 2.7.2
%define libvers 2.7
#--end constants--
%define release 1pydotorg