http://hg.python.org/cpython/rev/0244f336b8f9 changeset: 90930:0244f336b8f9 branch: 2.7 parent: 90924:e90024db8d6c parent: 90929:4b38a5a36536 user: Benjamin Peterson <benjamin@python.org> date: Sat May 31 11:24:25 2014 -0700 summary: merge 2.7.7 release branch files: .hgtags | 1 + Include/patchlevel.h | 6 +++--- Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 13 +++++++++++++ Misc/RPM/python-2.7.spec | 2 +- README | 4 ++-- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -164,3 +164,4 @@ 4913d0e9be30666218cc4d713937e81c0e7f346a v2.7.6rc1 3a1db0d2747ec2d47a8693ed5650f3567161a200 v2.7.6 e32e3a9f390212463c22509d0f9aead8051cee63 v2.7.7rc1 +f89216059edf77660ef1eb2a98e88352551da1d6 v2.7.7 diff --git a/Include/patchlevel.h b/Include/patchlevel.h --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -23,11 +23,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 7 #define PY_MICRO_VERSION 7 -#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.7rc1" +#define PY_VERSION "2.7.7" /*--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.7rc1" +__version__ = "2.7.7" #--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.7rc1" +IDLE_VERSION = "2.7.7" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -53,6 +53,19 @@ - Issue #20635: Added tests for Tk geometry managers. +What's New in Python 2.7.7 +========================== + +*Release date: 2014-05-31* + +Build +----- + +- Issue #21462: Build the Windows installers with OpenSSL 1.0.1g. + +- Issue #19866: Include some test data in the Windows installers, so tests don't + fail. + What's New in Python 2.7.7 release candidate 1? =============================================== 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.7rc1 +%define version 2.7.7 %define libvers 2.7 #--end constants-- %define release 1pydotorg diff --git a/README b/README --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is Python version 2.7.7 release candidate 1 -================================================ +This is Python version 2.7.7 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved. -- Repository URL: http://hg.python.org/cpython