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

[benjamin.peterson]

https://hg.python.org/cpython/rev/dce981bac5da
changeset:   96217:dce981bac5da
branch:      2.7
parent:      96203:bccaba8a5482
parent:      96216:117af4bc0513
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri May 22 17:55:22 2015 -0500
summary:
  merge 2.7.10 release branch

files:
  Lib/idlelib/idlever.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


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,4 @@
-IDLE_VERSION = "2.7.10rc1"
+"""Unused by Idle: there is no separate Idle version anymore.
+Kept only for possible existing extension use."""
+from sys import version
+IDLE_VERSION = version[:version.index(' ')]

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