From a59c27ac5d535be60300ee3c5d3164522398d1dd Mon Sep 17 00:00:00 2001 From: James Bennett Date: Wed, 1 Oct 2008 01:23:55 +0000 Subject: [PATCH] [1.0.X] Apply fix from [9107] git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9108 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..353bd7fecb 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_tuple = __import__('django').get_version() +if u'SVN' in version: + version = ' '.join(version.split(' ')[:-1]) setup( name = "Django",