merge 2.7.10 release branch

b1f37974 · Benjamin Peterson · 80cb186b · a71a4f4e · b1f37974
Commit b1f37974 authored May 22, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Lib/idlelib/idlever.py Lib/idlelib/idlever.py +4 -1

No files found.
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
-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(' ')]