Ticket #4517: version.diff

django/conf/global_settings.py

@@ -241 +241 @@
 
 # The User-Agent string to use when checking for URL validity through the
 # isExistingURL validator.
-URL_VALIDATOR_USER_AGENT = "Django/0.96pre (http://www.djangoproject.com)"
+from django import get_version
+URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
 
 ##############
 # MIDDLEWARE #

django/__init__.py

@@ -1 +1 @@
 VERSION = (0, 97, 'pre')
+
+def get_version():
+    "Returns the version as a human-format string."
+    v = '.'.join([str(i) for i in VERSION[:-1]])
+    if VERSION[-1]:
+        v += '-' + VERSION[-1]
+    return v

django/core/management.py

@@ -20 +20 @@
     {%% endif %%}'''
 
 APP_ARGS = '[appname ...]'
+DJANGO_VERSION = django.get_version()
 
 # Use django.__path__[0] because we don't know which directory django into
 # which has been installed.
@@ -93 +94 @@
 # 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()
 
-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[-1]:
-        v += '-' + VERSION[-1]
-    return v
-
 def get_sql_create(app):
     "Returns a list of the CREATE TABLE SQL statements for the given app."
     from django.db import get_creation_module, models
@@ -1172 +1165 @@
         from django.conf import settings
         print "Validating models..."
         validate()
-        print "\nDjango version %s, using settings %r" % (get_version(), settings.SETTINGS_MODULE)
+        print "\nDjango version %s, using settings %r" % (DJANGO_VERSION, settings.SETTINGS_MODULE)
         print "Development server is running at http://%s:%s/" % (addr, port)
         print "Quit the server with %s." % quit_command
         try:
@@ -1525 +1518 @@
         argv = sys.argv
 
     # Parse the command-line arguments. optparse handles the dirty work.
-    parser = DjangoOptionParser(usage=get_usage(action_mapping), version=get_version())
+    parser = DjangoOptionParser(usage=get_usage(action_mapping), version=DJANGO_VERSION)
     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.')
     parser.add_option('--pythonpath',