summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2009-07-29 04:11:33 +0000
committerJames Bennett <ubernostrum@gmail.com>2009-07-29 04:11:33 +0000
commitb8997d66be0420c78ecc0c73efeecc1e06cbfc97 (patch)
treec1ba993e84055c50c4417e3f1d5c29c889df667c
parentdf7f917b7f51ba969faa49d000ffc79572c5dcb4 (diff)
downloaddjango-b8997d66be0420c78ecc0c73efeecc1e06cbfc97.tar.gz
[1.0.X] We don't need to put the 'final' bit in the version number, and it messes up some pypi stuff. Backport of [11358] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/__init__.py b/django/__init__.py
index b4d0c1375f..5f6b0c3fe4 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -7,9 +7,8 @@ def get_version():
if VERSION[3:] == ('alpha', 0):
version = '%s pre-alpha' % version
else:
- version = '%s %s' % (version, VERSION[3])
if VERSION[3] != 'final':
- version = '%s %s' % (version, VERSION[4])
+ version = '%s %s %s' % (version, VERSION[3], VERSION[4])
from django.utils.version import get_svn_revision
svn_rev = get_svn_revision()
if svn_rev != u'SVN-unknown':