From c1093ca87fbcb57c47aeb323edacfadead859cb2 Mon Sep 17 00:00:00 2001 From: Honza Král Date: Sun, 5 Jul 2009 13:29:08 +0000 Subject: [soc2009/model-validation] SlugField and IPAddressField now use validators. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@11191 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/fields.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'django/forms') diff --git a/django/forms/fields.py b/django/forms/fields.py index 9a037faca3..02e80456ab 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -914,23 +914,17 @@ class SplitDateTimeField(MultiValueField): return datetime.datetime.combine(*data_list) return None -ipv4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$') -class IPAddressField(RegexField): +class IPAddressField(CharField): default_error_messages = { 'invalid': _(u'Enter a valid IPv4 address.'), } + default_validators = [validators.validate_ipv4_address] - def __init__(self, *args, **kwargs): - super(IPAddressField, self).__init__(ipv4_re, *args, **kwargs) - -slug_re = re.compile(r'^[-\w]+$') -class SlugField(RegexField): +class SlugField(CharField): default_error_messages = { 'invalid': _(u"Enter a valid 'slug' consisting of letters, numbers," u" underscores or hyphens."), } - - def __init__(self, *args, **kwargs): - super(SlugField, self).__init__(slug_re, *args, **kwargs) + default_validators = [validators.validate_slug] -- cgit v1.3