Ticket #13804: URLField.diff

django/forms/fields.py

@@ -523 +523 @@
             f.seek(0)
         return f
 
+url_scheme_re = re.compile(r'^[a-z][-+.a-z0-9]*://', re.IGNORECASE)
 class URLField(CharField):
     default_error_messages = {
         'invalid': _(u'Enter a valid URL.'),
@@ -537 +538 @@
 
     def to_python(self, value):
         if value:
-            if '://' not in value:
+            if not url_scheme_re.match(value):
                 # If no URL scheme given, assume http://
                 value = u'http://%s' % value
             url_fields = list(urlparse.urlsplit(value))

tests/regressiontests/forms/fields.py

@@ -491 +491 @@
         self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://inv-.-alid.com')
         self.assertEqual(u'http://valid-----hyphens.com/', f.clean('http://valid-----hyphens.com'))
         self.assertEqual(u'http://some.idn.xyz\xe4\xf6\xfc\xdfabc.domain.com:123/blah', f.clean('http://some.idn.xyzäöüßabc.domain.com:123/blah'))
+        self.assertEqual(u'http://www.example.com/://', f.clean('www.example.com/://'))
 
     def test_url_regex_ticket11198(self):
         f = URLField()