Refs #23919 -- Simplified assertRaisesRegex()'s that accounted for Python 2.

3 files changed, 8 insertions, 10 deletions

diff --git a/tests/forms_tests/field_tests/test_regexfield.py b/tests/forms_tests/field_tests/test_regexfield.py
index bd8d6dda09..6f4cc440e9 100644
--- a/tests/forms_tests/field_tests/test_regexfield.py
+++ b/tests/forms_tests/field_tests/test_regexfield.py
@@ -42,10 +42,10 @@ class RegexFieldTest(SimpleTestCase):
         f = RegexField('^[0-9]+$', min_length=5, max_length=10)
         with self.assertRaisesMessage(ValidationError, "'Ensure this value has at least 5 characters (it has 3).'"):
             f.clean('123')
-        with self.assertRaisesRegex(
+        with self.assertRaisesMessage(
             ValidationError,
-            r"'Ensure this value has at least 5 characters \(it has 3\)\.',"
-            r" u?'Enter a valid value\.'",
+            "'Ensure this value has at least 5 characters (it has 3).', "
+            "'Enter a valid value.'",
         ):
             f.clean('abc')
         self.assertEqual('12345', f.clean('12345'))
diff --git a/tests/forms_tests/field_tests/test_splitdatetimefield.py b/tests/forms_tests/field_tests/test_splitdatetimefield.py
index be70edd3d4..940d03b8a9 100644
--- a/tests/forms_tests/field_tests/test_splitdatetimefield.py
+++ b/tests/forms_tests/field_tests/test_splitdatetimefield.py
@@ -20,7 +20,7 @@ class SplitDateTimeFieldTest(SimpleTestCase):
             f.clean('')
         with self.assertRaisesMessage(ValidationError, "'Enter a list of values.'"):
             f.clean('hello')
-        with self.assertRaisesRegex(ValidationError, r"'Enter a valid date\.', u?'Enter a valid time\.'"):
+        with self.assertRaisesMessage(ValidationError, "'Enter a valid date.', 'Enter a valid time.'"):
             f.clean(['hello', 'there'])
         with self.assertRaisesMessage(ValidationError, "'Enter a valid time.'"):
             f.clean(['2006-01-10', 'there'])
@@ -40,7 +40,7 @@ class SplitDateTimeFieldTest(SimpleTestCase):
         self.assertIsNone(f.clean(['', '']))
         with self.assertRaisesMessage(ValidationError, "'Enter a list of values.'"):
             f.clean('hello')
-        with self.assertRaisesRegex(ValidationError, r"'Enter a valid date\.', u?'Enter a valid time\.'"):
+        with self.assertRaisesMessage(ValidationError, "'Enter a valid date.', 'Enter a valid time.'"):
             f.clean(['hello', 'there'])
         with self.assertRaisesMessage(ValidationError, "'Enter a valid time.'"):
             f.clean(['2006-01-10', 'there'])
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index dacd7739d3..dc70519dac 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -2954,10 +2954,8 @@ Good luck picking a username that doesn&#39;t already exist.</p>
         with self.assertRaisesMessage(ValidationError, "'Enter a complete value.'"):
             f.clean(['+61'])
         self.assertEqual('+61.287654321 ext. 123 (label: )', f.clean(['+61', '287654321', '123']))
-        self.assertRaisesRegex(
-            ValidationError,
-            r"'Enter a complete value\.', u?'Enter an extension\.'", f.clean, ['', '', '', 'Home']
-        )
+        with self.assertRaisesMessage(ValidationError, "'Enter a complete value.', 'Enter an extension.'"):
+            f.clean(['', '', '', 'Home'])
         with self.assertRaisesMessage(ValidationError, "'Enter a valid country code.'"):
             f.clean(['61', '287654321', '123', 'Home'])
 
@@ -2970,7 +2968,7 @@ Good luck picking a username that doesn&#39;t already exist.</p>
         with self.assertRaisesMessage(ValidationError, "'Enter a complete value.'"):
             f.clean(['+61'])
         self.assertEqual('+61.287654321 ext. 123 (label: )', f.clean(['+61', '287654321', '123']))
-        with self.assertRaisesRegex(ValidationError, r"'Enter a complete value\.', u?'Enter an extension\.'"):
+        with self.assertRaisesMessage(ValidationError, "'Enter a complete value.', 'Enter an extension.'"):
             f.clean(['', '', '', 'Home'])
         with self.assertRaisesMessage(ValidationError, "'Enter a valid country code.'"):
             f.clean(['61', '287654321', '123', 'Home'])