Base __version__ on sys.version_info, as distutils is

no longer maintained separatedly.

diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8a28531c8cf469666b6c398a1e31c479e223b43f..9c60e54690e9682d89e2d4a4733c3a819e24d284 100644 (file)
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -12,4 +12,6 @@ used from a setup script as
 
 __revision__ = "$Id$"
 
-__version__ = "2.5.0"
+import sys
+__version__ = "%d.%d.%d" % sys.version_info[:3]
+del sys

diff --git a/Misc/NEWS b/Misc/NEWS
index dec5a2c0d570143180e1fcf79f13bf0dee753d59..80d67e2e02deb8ca733bb6d83b3da595b1cd362e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,7 +80,8 @@ Library
   side effects from one test to the next affect outcomes.  ``DocTestFinder``
   has been changed to sort the list of tests it returns.
 
-- The distutils version has been changed to 2.5.0.
+- The distutils version has been changed to 2.5.0, and are now kept
+  in sync with sys.version_info[:3].
 
 - Bug #978833: Really close underlying socket in _socketobject.close.