2 files changed, 22 insertions, 10 deletions
diff --git a/django/core/validators.py b/django/core/validators.py
index 1426c1c903..6758a387b0 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -22,6 +22,24 @@ def validate_email(value):
     if not email_re.search(smart_unicode(value)):
         raise ValidationError(_(u'Enter a valid e-mail address.'), code='invalid')
 
+slug_re = re.compile(r'^[-\w]+$')
+
+def validate_slug(value):
+    if not slug_re.search(smart_unicode(value)):
+        raise ValidationError(
+            _(u"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."),
+            code='invalid'
+        )
+
+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}$')
+
+def validate_ipv4_address(value):
+    if not ipv4_re.search(smart_unicode(value)):
+        raise ValidationError(
+            _(u'Enter a valid IPv4 address.'),
+            code="invalid"
+        )
+
 class MaxValueValidator(object):
     def __init__(self, max_value):
         self.max_value = max_value
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]