summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt8
-rw-r--r--docs/topics/testing/overview.txt2
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index da0d1e212c..df3d84fdae 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -267,7 +267,6 @@ these changes.
in 1.4. The backward compatibility will be removed --
``HttpRequest.raw_post_data`` will no longer work.
-
* The value for the ``post_url_continue`` parameter in
``ModelAdmin.response_add()`` will have to be either ``None`` (to redirect
to the newly created object's edit page) or a pre-formatted url. String
@@ -314,6 +313,13 @@ these changes.
* The ``depth`` keyword argument will be removed from
:meth:`~django.db.models.query.QuerySet.select_related`.
+* The undocumented ``get_warnings_state()``/``restore_warnings_state()``
+ functions from :mod:`django.test.utils` and the ``save_warnings_state()``/
+ ``restore_warnings_state()``
+ :ref:`django.test.*TestCase <django-testcase-subclasses>` methods are
+ deprecated. Use the :class:`warnings.catch_warnings` context manager
+ available starting with Python 2.6 instead.
+
1.8
---
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 534569efeb..5739061dd1 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -835,6 +835,8 @@ The following is a simple unit test using the test client::
:class:`django.test.client.RequestFactory`
+.. _django-testcase-subclasses:
+
Provided test case classes
--------------------------