Changeset 5451

Timestamp:

06/09/07 21:00:46 (2 years ago)

Author:

mtredinnick

Message:

Fixed #4517 -- Made sure that URL_VALIDATOR_USER_AGENT includes the up-to-date
Django version number. Thanks, James Wheare.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (2 diffs)
• django/trunk/django/__init__.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -235 +235 @@
-    Dan Watson <http://theidioteque.net/>
-    Chris Wesseling <Chris.Wesseling@cwi.nl>
+    James Wheare <django@sparemint.com>
-    charly.wilhelm@gmail.com
-    Rachel Willmer <http://www.willmer.com/kb/>

django/trunk/django/conf/global_settings.py

@@ -242 +242 @@
-# The User-Agent string to use when checking for URL validity through the
-# isExistingURL validator.
-
+
+
-
-##############

django/trunk/django/core/management.py

@@ -4 +4 @@
-import django
-from django.core.exceptions import ImproperlyConfigured
-import os, re, shutil, sys, textwrap
-from optparse import OptionParser
-from django.utils import termcolors
+import os, re, shutil, sys, textwrap
-
-# For Python 2.3
-if not hasattr(__builtins__, 'set'):
-    from sets import Set as set
+
+# For backwards compatibility: get_version() used to be in this module.
+get_version = django.get_version
-
-MODULE_TEMPLATE = '''    {%% if perms.%(app)s.%(addperm)s or perms.%(app)s.%(changeperm)s %%}
@@ -93 +96 @@
-# 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):

django/trunk/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