diff options
| -rw-r--r-- | django/core/validators.py | 12 | ||||
| -rw-r--r-- | tests/validators/tests.py | 27 |
2 files changed, 38 insertions, 1 deletions
diff --git a/django/core/validators.py b/django/core/validators.py index cc71b72a6a..da59c0e924 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -51,7 +51,17 @@ class RegexValidator(object): raise ValidationError(self.message, code=self.code) def __eq__(self, other): - return isinstance(other, RegexValidator) and (self.regex == other.regex) and (self.message == other.message) and (self.code == other.code) + return ( + isinstance(other, RegexValidator) and + self.regex.pattern == other.regex.pattern and + self.regex.flags == other.regex.flags and + (self.message == other.message) and + (self.code == other.code) and + (self.inverse_match == other.inverse_match) + ) + + def __ne__(self, other): + return not (self == other) @deconstructible diff --git a/tests/validators/tests.py b/tests/validators/tests.py index 928c482107..d073bf264f 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -296,6 +296,33 @@ class TestValidatorEquality(TestCase): RegexValidator(r'^(?:[a-z0-9\.\-]*)://'), ) + self.assertNotEqual( + RegexValidator('', flags=re.IGNORECASE), + RegexValidator(''), + ) + + self.assertNotEqual( + RegexValidator(''), + RegexValidator('', inverse_match=True), + ) + + def test_regex_equality_nocache(self): + pattern = r'^(?:[a-z0-9\.\-]*)://' + left = RegexValidator(pattern) + re.purge() + right = RegexValidator(pattern) + + self.assertEqual( + left, + right, + ) + + def test_regex_equality_blank(self): + self.assertEqual( + RegexValidator(), + RegexValidator(), + ) + def test_email_equality(self): self.assertEqual( EmailValidator(), |