summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorBaptiste Mispelon <bmispelon@gmail.com>2013-06-13 18:37:08 +0200
committerTim Graham <timograham@gmail.com>2013-06-13 13:31:57 -0400
commitdc9c359546580d40df209816cef244b78dcf7435 (patch)
tree88e146d707a66c033321050b6737e17b09226f59 /django
parent675558d00efab507ef2e538025f20abc6725b159 (diff)
Fixed #20594 -- Add validation to models.SlugField.
Thanks carbonXT for the report.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py3
-rw-r--r--django/forms/fields.py5
2 files changed, 3 insertions, 5 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 7d01391d4f..cf81a27997 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1211,6 +1211,7 @@ class PositiveSmallIntegerField(IntegerField):
return super(PositiveSmallIntegerField, self).formfield(**defaults)
class SlugField(CharField):
+ default_validators = [validators.validate_slug]
description = _("Slug (up to %(max_length)s)")
def __init__(self, *args, **kwargs):
@@ -1320,12 +1321,12 @@ class TimeField(Field):
return super(TimeField, self).formfield(**defaults)
class URLField(CharField):
+ default_validators = [validators.URLValidator()]
description = _("URL")
def __init__(self, verbose_name=None, name=None, **kwargs):
kwargs['max_length'] = kwargs.get('max_length', 200)
CharField.__init__(self, verbose_name, name, **kwargs)
- self.validators.append(validators.URLValidator())
def formfield(self, **kwargs):
# As with CharField, this will cause URL validation to be performed
diff --git a/django/forms/fields.py b/django/forms/fields.py
index ac68b9f1fc..420690704f 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -638,10 +638,7 @@ class URLField(CharField):
default_error_messages = {
'invalid': _('Enter a valid URL.'),
}
-
- def __init__(self, max_length=None, min_length=None, *args, **kwargs):
- super(URLField, self).__init__(max_length, min_length, *args, **kwargs)
- self.validators.append(validators.URLValidator())
+ default_validators = [validators.URLValidator()]
def to_python(self, value):