Fixed #1177 -- Added django.VERSION and '--version' command to django-admin.py/manage.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
c14e692952
commit
a10e8153f3
|
@ -0,0 +1 @@
|
||||||
|
VERSION = (0, 9, 1, 'SVN')
|
|
@ -63,6 +63,14 @@ def _is_valid_dir_name(s):
|
||||||
# field as the field to which it points.
|
# field as the field to which it points.
|
||||||
get_rel_data_type = lambda f: (f.get_internal_type() in ('AutoField', 'PositiveIntegerField', 'PositiveSmallIntegerField')) and 'IntegerField' or f.get_internal_type()
|
get_rel_data_type = lambda f: (f.get_internal_type() in ('AutoField', 'PositiveIntegerField', 'PositiveSmallIntegerField')) and 'IntegerField' or f.get_internal_type()
|
||||||
|
|
||||||
|
def get_version():
|
||||||
|
"Returns the version as a human-format string."
|
||||||
|
from django import VERSION
|
||||||
|
v = '.'.join([str(i) for i in VERSION[:-1]])
|
||||||
|
if VERSION[3]:
|
||||||
|
v += ' (%s)' % VERSION[3]
|
||||||
|
return v
|
||||||
|
|
||||||
def get_sql_create(mod):
|
def get_sql_create(mod):
|
||||||
"Returns a list of the CREATE TABLE SQL statements for the given module."
|
"Returns a list of the CREATE TABLE SQL statements for the given module."
|
||||||
from django.core import db, meta
|
from django.core import db, meta
|
||||||
|
@ -900,7 +908,7 @@ def print_error(msg, cmd):
|
||||||
|
|
||||||
def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING):
|
def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING):
|
||||||
# Parse the command-line arguments. optparse handles the dirty work.
|
# Parse the command-line arguments. optparse handles the dirty work.
|
||||||
parser = DjangoOptionParser(get_usage(action_mapping))
|
parser = DjangoOptionParser(usage=get_usage(action_mapping), version=get_version())
|
||||||
parser.add_option('--settings',
|
parser.add_option('--settings',
|
||||||
help='Python path to settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.')
|
help='Python path to settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.')
|
||||||
parser.add_option('--pythonpath',
|
parser.add_option('--pythonpath',
|
||||||
|
|
Loading…
Reference in New Issue