summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-07-27 17:03:35 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-07-27 17:03:35 +0000
commitaaa3cc0ea3a450deda16da5ab235e6ec9d6e16f9 (patch)
tree51d7efaa690fb327b95524ce7455d459f5b455a8
parent16bdaa7acb69e3b48cdd483445ab1c884df072ad (diff)
Changed output of django-admin.py --version to use a hyphen instead of parenthesis, to be clearer
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/django/core/management.py b/django/core/management.py
index 8e1c3d624d..14182cbdff 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -78,7 +78,7 @@ def get_version():
from django import VERSION
v = '.'.join([str(i) for i in VERSION[:-1]])
if VERSION[-1]:
- v += ' (%s)' % VERSION[-1]
+ v += '-' + VERSION[-1]
return v
def get_sql_create(app):
@@ -217,7 +217,7 @@ def _get_sql_for_pending_references(model, pending_references):
def _get_many_to_many_sql_for_model(model):
from django.db import backend, get_creation_module
from django.db.models import GenericRel
-
+
data_types = get_creation_module().DATA_TYPES
opts = model._meta
@@ -817,10 +817,10 @@ def get_validation_errors(outfile, app=None):
from django.db.models.fields.related import RelatedObject
e = ModelErrorCollection(outfile)
-
+
for (app_name, error) in get_app_errors().items():
e.add(app_name, error)
-
+
for cls in models.get_models(app):
opts = cls._meta
@@ -885,7 +885,7 @@ def get_validation_errors(outfile, app=None):
if r.get_accessor_name() == rel_query_name:
e.add(opts, "Reverse query name for field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))
-
+
for i, f in enumerate(opts.many_to_many):
# Check to see if the related m2m field will clash with any
# existing fields, m2m fields, m2m related objects or related objects