Changeset 6152

Timestamp:

09/13/07 21:11:24 (11 months ago)

Author:

russellm

Message:

Fixed #3421 -- Added IP and localhost validation to newforms URLField. Thanks, SmileyChris?.

Files:

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

django/trunk/django/newforms/fields.py

@@ -336 +336 @@
-            ugettext(u'Enter a valid e-mail address.'), *args, **kwargs)
-
-url_re = re.compile(
-    r'^https?://' # http:// or https://
-    r'(?:[A-Z0-9-]+\.)+[A-Z]{2,6}' # domain
-    r'(?::\d+)?' # optional port
-    r'(?:/?|/\S+)$', re.IGNORECASE)
-
-try:
-    from django.conf import settings
@@ -399 +393 @@
-            raise ValidationError(ugettext(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image."))
-        return f
+
+url_re = re.compile(
+    r'^https?://' # http:// or https://
+    r'(?:(?:[A-Z0-9-]+\.)+[A-Z]{2,6}|' #domain...
+    r'localhost|' #localhost...
+    r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
+    r'(?::\d+)?' # optional port
+    r'(?:/?|/\S+)$', re.IGNORECASE)
-
-class URLField(RegexField):

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

@@ -1608 +1608 @@
-...
-ValidationError: [u'This field is required.']
+>>> f.clean('http://localhost')
+u'http://localhost'
->>> f.clean('http://example.com')
-u'http://example.com'
->>> f.clean('http://www.example.com')
-u'http://www.example.com'
+>>> f.clean('http://www.example.com:8000/test')
+u'http://www.example.com:8000/test'
+>>> f.clean('http://200.8.9.10')
+u'http://200.8.9.10'
+>>> f.clean('http://200.8.9.10:8000/test')
+u'http://200.8.9.10:8000/test'
->>> f.clean('foo')
-Traceback (most recent call last):