From 2d3712f930916c5f45ef3a4d68a56e0add2a621c Mon Sep 17 00:00:00 2001 From: James Bennett Date: Wed, 1 Oct 2008 01:22:41 +0000 Subject: [PATCH] Change version calculation in setup.py to go with the new VERSION tuple git-svn-id: http://code.djangoproject.com/svn/django/trunk@9107 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 70f3cbc041..2f65cfa64e 100644 --- a/setup.py +++ b/setup.py @@ -66,11 +66,9 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst': file_info[0] = '\\PURELIB\\%s' % file_info[0] # Dynamically calculate the version based on django.VERSION. -version_tuple = __import__('django').VERSION -if version_tuple[2] is not None: - version = "%d.%d_%s" % version_tuple -else: - version = "%d.%d" % version_tuple[:2] +version = __import__('django').get_version() +if u'SVN' in version: + version = ' '.join(version.split(' ')[:-1]) setup( name = "Django",