Fixed #25190 -- Deprecated callable_obj parameter to assertRaisesMessage().

Thanks Aymeric Augustin for review.

3 files changed, 12 insertions, 0 deletions

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index a9e60b379f..4a14acd734 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -89,6 +89,9 @@ details on these changes.
 
 * The ``current_app`` parameter to the ``contrib.auth`` views will be removed.
 
+* The ``callable_obj`` keyword argument to
+  ``SimpleTestCase.assertRaisesMessage()`` will be removed.
+
 .. _deprecation-removed-in-1.10:
 
 1.10
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index b14a4040d8..2e8b44adf0 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -1077,6 +1077,10 @@ Miscellaneous
 * ``django.template.loaders.eggs.Loader`` is deprecated as distributing
   applications as eggs is not recommended.
 
+* The ``callable_obj`` keyword argument to
+  ``SimpleTestCase.assertRaisesMessage()`` is deprecated. Pass the callable as
+  a positional argument instead.
+
 .. removed-features-1.9:
 
 Features removed in 1.9
diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt
index fef718c7c6..27db72daa1 100644
--- a/docs/topics/testing/tools.txt
+++ b/docs/topics/testing/tools.txt
@@ -1364,6 +1364,11 @@ your test suite.
         with self.assertRaisesMessage(ValueError, 'invalid literal for int()'):
             int('a')
 
+    .. deprecated:: 1.9
+
+        Passing ``callable`` as a keyword argument called ``callable_obj`` is
+        deprecated. Pass the callable as a positional argument instead.
+
 .. method:: SimpleTestCase.assertFieldOutput(fieldclass, valid, invalid, field_args=None, field_kwargs=None, empty_value='')
 
     Asserts that a form field behaves correctly with various inputs.