Merge branch 'master' into schema-alteration

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/regressiontests/inline_formsets/tests.py
index 6e63f34ed0..e979fb4337 100644
--- a/tests/regressiontests/inline_formsets/tests.py
+++ b/tests/regressiontests/inline_formsets/tests.py
@@ -123,7 +123,7 @@ class InlineFormsetFactoryTest(TestCase):
         Child has two ForeignKeys to Parent, so if we don't specify which one
         to use for the inline formset, we should get an exception.
         """
-        self.assertRaisesRegexp(Exception,
+        six.assertRaisesRegex(self, Exception,
             "<class 'regressiontests.inline_formsets.models.Child'> has more than 1 ForeignKey to <class 'regressiontests.inline_formsets.models.Parent'>",
             inlineformset_factory, Parent, Child
         )
@@ -143,7 +143,7 @@ class InlineFormsetFactoryTest(TestCase):
         If the field specified in fk_name is not a ForeignKey, we should get an
         exception.
         """
-        self.assertRaisesRegexp(Exception,
+        six.assertRaisesRegex(self, Exception,
             "<class 'regressiontests.inline_formsets.models.Child'> has no field named 'test'",
             inlineformset_factory, Parent, Child, fk_name='test'
         )