From 724a7bf222e31f42e2ab431cc09da224081d03fa Mon Sep 17 00:00:00 2001
From: David Szotten <davidszotten@gmail.com>
Date: Tue, 6 May 2014 21:57:37 +0100
Subject: [PATCH] [1.7.x] Fixed #22588 -- Fix RegexValidator __eq__

Compare parameters instead of re.pattern instances, and add the other
parameters to the comparison. Also add a __ne__ to make assertNotEqual
work properly.
---
 django/core/validators.py | 12 +++++++++++-
 tests/validators/tests.py | 27 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/django/core/validators.py b/django/core/validators.py
index cc71b72a6ac..da59c0e924f 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 928c482107f..d073bf264ff 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(),