From 0f2ceee0254349ee4ac7d472d3efe67ee161a917 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 2 Aug 2014 18:33:18 -0400 Subject: Fixed #23151 -- Deprecated RegexField.error_message. Thanks Baptiste Mispelon for the suggestion. --- django/forms/fields.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django/forms/fields.py') diff --git a/django/forms/fields.py b/django/forms/fields.py index 6e44ccfbb7..36f13472eb 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -25,7 +25,7 @@ from django.forms.widgets import ( from django.utils import formats from django.utils.encoding import smart_text, force_str, force_text from django.utils.ipv6 import clean_ipv6_address -from django.utils.deprecation import RemovedInDjango19Warning +from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning from django.utils import six from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit from django.utils.translation import ugettext_lazy as _, ungettext_lazy @@ -531,6 +531,11 @@ class RegexField(CharField): """ # error_message is just kept for backwards compatibility: if error_message is not None: + warnings.warn( + "The 'error_message' argument is deprecated. Use " + "Field.error_messages['invalid'] instead.", + RemovedInDjango20Warning, stacklevel=2 + ) error_messages = kwargs.get('error_messages') or {} error_messages['invalid'] = error_message kwargs['error_messages'] = error_messages -- cgit v1.3