[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/f16ae8ec5553
changeset:   96293:f16ae8ec5553
parent:      96288:10d6ae57d071
parent:      96292:9e2a191b243d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 25 21:25:27 2015 -0500
summary:
  Merge 3.5

files:
  Lib/distutils/__init__.py |  10 +++-------
  1 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -8,10 +8,6 @@
    setup (...)
 """
 
-# Distutils version
-#
-# Updated automatically by the Python release process.
-#
-#--start constants--
-__version__ = "3.5.0b1"
-#--end constants--
+import sys
+
+__version__ = sys.version[:sys.version.index(' ')]

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