Changeset 6173

Timestamp:

09/14/07 02:02:55 (1 year ago)

Author:

russellm

Message:

Fiex #5331 -- Modified newforms URLField to prepend http:// if no protocol is specified by the user. Thanks, SmileyChris?.

Files:

• django/trunk/django/newforms/fields.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (3 diffs)

django/trunk/django/newforms/fields.py

@@ -417 +417 @@
-
-    def clean(self, value):
+        # If no URL scheme given, assume http://
+        if value and '://' not in value:
+            value = u'http://%s' % value
-        value = super(URLField, self).clean(value)
-        if value == u'':

django/trunk/tests/regressiontests/forms/tests.py

@@ -1624 +1624 @@
-...
-ValidationError: [u'Enter a valid URL.']
->>> f.clean('example.com')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a valid URL.']
->>> f.clean('http://')
-Traceback (most recent call last):
@@ -1658 +1654 @@
-...
-ValidationError: [u'Enter a valid URL.']
->>> f.clean('example.com')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a valid URL.']
->>> f.clean('http://')
-Traceback (most recent call last):
@@ -1714 +1706 @@
-...
-ValidationError: [u'Ensure this value has at most 20 characters (it has 37).']
+
+URLField should prepend 'http://' if no scheme was given
+>>> f = URLField(required=False)
+>>> f.clean('example.com')
+u'http://example.com'
+>>> f.clean('')
+u''
+>>> f.clean('https://example.com')
+u'https://example.com'
-
-# BooleanField ################################################################