diff options
Diffstat (limited to 'django/__init__.py')
| -rw-r--r-- | django/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py index a21c3344f1..2b87a7e242 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, 'beta', 1) +VERSION = (1, 2, 0, 'alpha', 0) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) @@ -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': |