mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20784 -- Added inverse_match parameter to RegexValidator.

Browse Source
This commit is contained in:
Si Feng
2013-07-21 17:27:56 -07:00
committed by Tim Graham
parent 0d98422b13
commit b102c27ff4
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
django/core/validators.py
View File

@@ -20,14 +20,17 @@ class RegexValidator(object):
regex = ''
message = _('Enter a valid value.')
code = 'invalid'
inverse_match = False
def __init__(self, regex=None, message=None, code=None):
def __init__(self, regex=None, message=None, code=None, inverse_match=None):
if regex is not None:
self.regex = regex
if message is not None:
self.message = message
if code is not None:
self.code = code
if inverse_match is not None:
self.inverse_match = inverse_match
# Compile the regex if it was not passed pre-compiled.
if isinstance(self.regex, six.string_types):
@@ -35,9 +38,11 @@ class RegexValidator(object):
def __call__(self, value):
"""
Validates that the input matches the regular expression.
Validates that the input matches the regular expression
if inverse_match is False, otherwise raises ValidationError.
"""
if not self.regex.search(force_text(value)):
if not (self.inverse_match is not bool(self.regex.search(
force_text(value)))):
raise ValidationError(self.message, code=self.code)
def __eq__(self, other):