summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-07-30 13:14:05 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-07-30 13:14:05 (GMT)
commit1f30c3777c40fd00b5237556857ca332ead37b6d (patch)
treed1d94e2843e4109cf19d3086ebf668dcef6326ef
parent4e67838d6c16d3ab14b01ffdb1318aa16ed9bccf (diff)
downloadcpython-1f30c3777c40fd00b5237556857ca332ead37b6d.zip
cpython-1f30c3777c40fd00b5237556857ca332ead37b6d.tar.gz
cpython-1f30c3777c40fd00b5237556857ca332ead37b6d.tar.bz2
Base __version__ on sys.version_info, as distutils is
no longer maintained separatedly.
-rw-r--r--Lib/distutils/__init__.py4
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8a28531..9c60e54 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 dec5a2c..80d67e2 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.