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

[benjamin.peterson]

https://hg.python.org/cpython/rev/eb514ea492fe
changeset:   93812:eb514ea492fe
branch:      2.7
parent:      93809:dff3ad157648
parent:      93811:753a8f457ddc
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Dec 10 10:58:13 2014 -0500
summary:
  merge 2.7.9 release branch

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -167,3 +167,4 @@
 f89216059edf77660ef1eb2a98e88352551da1d6 v2.7.7
 ee879c0ffa11caaa34bf01537e1c4411dd948552 v2.7.8
 40eada278702349a2b2f334aa9d91fa7090ea1e3 v2.7.9rc1
+648dcafa7e5f40da31079bc7a7f0c445f1ea4ab9 v2.7.9
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	9
-#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.9rc1"
+#define PY_VERSION      	"2.7.9"
 /*--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.9rc1"
+__version__ = "2.7.9"
 #--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.9rc1"
+IDLE_VERSION = "2.7.9"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,7 +53,7 @@
 What's New in Python 2.7.9?
 ===========================
 
-*Release date: 2014-12-XX*
+*Release date: 2014-12-10*
 
 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.9rc1
+%define version 2.7.9
 %define libvers 2.7
 #--end constants--
 %define release 1pydotorg

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