From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 30 Jul 2006 13:14:05 +0000 (+0000)
Subject: Base __version__ on sys.version_info, as distutils is
X-Git-Tag: v2.5b3~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f30c3777c40fd00b5237556857ca332ead37b6d;p=python

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 8a28531c8c..9c60e54690 100644
--- 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 dec5a2c0d5..80d67e2e02 100644
--- 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.