Fixed #17491 -- Honored the version number format expected by distutils. Fixed #11236 too.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17351 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 14 insertions, 0 deletions

diff --git a/django/__init__.py b/django/__init__.py
index e790da37f3..6467c033bb 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -14,3 +14,17 @@ def get_version():
     if svn_rev != u'SVN-unknown':
         version = "%s %s" % (version, svn_rev)
     return version
+
+def get_distutils_version():
+    # Distutils expects a version number formatted as major.minor[.patch][sub]
+    parts = 5
+    if VERSION[3] == 'final':
+        parts = 3
+        if VERSION[2] == 0:
+            parts = 2
+    version = VERSION[:parts]
+    version = [str(x)[0] for x in version]      # ['1', '4', '0', 'a', '1']
+    if parts > 2:
+        version[2:] = [''.join(version[2:])]    # ['1', '4', '0a1']
+    version = '.'.join(version)                 # '1.4.0a1'
+    return version