Permalink
Browse files

Fix and test for cleaning a non-string value in a URLField

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 699688d commit fe88584589922c1a0e068f18c82fe1b17e437fcd @SmileyChris SmileyChris committed Sep 9, 2011
Showing with 6 additions and 1 deletion.
  1. +2 −1 django/forms/fields.py
  2. +4 −0 tests/regressiontests/forms/tests/fields.py
@@ -583,6 +583,7 @@ def __init__(self, max_length=None, min_length=None, verify_exists=False,
self.validators.append(validators.URLValidator(verify_exists=verify_exists, validator_user_agent=validator_user_agent))
def to_python(self, value):
+ value = super(URLField, self).to_python(value)
if value:
url_fields = list(urlparse.urlsplit(value))
if not url_fields[0]:
@@ -601,7 +602,7 @@ def to_python(self, value):
# the path portion may need to be added before query params
url_fields[2] = '/'
value = urlparse.urlunsplit(url_fields)
- return super(URLField, self).to_python(value)
+ return value
class BooleanField(Field):
widget = CheckboxInput
@@ -686,6 +686,10 @@ def test_urlfield_10(self):
url = u'http://t\xfcr.djangoproject.com/'
self.assertEqual(url, f.clean(url))
+ def test_urlfield_not_string(self):
+ f = URLField(required=False)
+ self.assertRaisesMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 23)
+
# BooleanField ################################################################
def test_booleanfield_1(self):

0 comments on commit fe88584

Please sign in to comment.