summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-09-02 18:52:30 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:10 -0400
commitb6ea1961eb6816dee4370fb0ebd49dba29478db1 (patch)
treeee19d76b5f13c058c8a4ec4d7420f4a81bab2947 /django
parent54fd769eb40c122485368f6d9257ab963b325ddd (diff)
Refs #23151 -- Removed RegexField.error_message per deprecation timeline.
Diffstat (limited to 'django')
-rw-r--r--django/forms/fields.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 85e7219cd4..66ff1de7fa 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -10,7 +10,6 @@ import os
import re
import sys
import uuid
-import warnings
from decimal import Decimal, DecimalException
from io import BytesIO
@@ -513,16 +512,6 @@ class RegexField(CharField):
'Enter a valid value' is too generic for you.
"""
kwargs.setdefault('strip', False)
- # 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.",
- RemovedInDjango110Warning, stacklevel=2
- )
- error_messages = kwargs.get('error_messages') or {}
- error_messages['invalid'] = error_message
- kwargs['error_messages'] = error_messages
super(RegexField, self).__init__(max_length, min_length, *args, **kwargs)
self._set_regex(regex)