summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-09-03 15:52:04 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:10 -0400
commit5e450c52aafb62b9d83c8ac08892e0b92cbec4aa (patch)
treedbc6b0360aba68d492dc0925d527c9c0f237f401 /docs/ref
parent75374d3797c2cd2423982a870bb0bc74821e951f (diff)
Removed current_app argument to render() and TemplateResponse().
Per deprecation timeline.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/template-response.txt12
-rw-r--r--docs/ref/templates/api.txt7
2 files changed, 2 insertions, 17 deletions
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index ecf984cdf3..8fbc7b1c99 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -189,7 +189,7 @@ TemplateResponse objects
Methods
-------
-.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, current_app=None, charset=None, using=None)
+.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, charset=None, using=None)
Instantiates a :class:`~django.template.response.TemplateResponse` object
with the given request, template, context, content type, HTTP status, and
@@ -224,16 +224,6 @@ Methods
``status``
The HTTP status code for the response.
- ``current_app``
- A hint indicating which application contains the current view. See the
- :ref:`namespaced URL resolution strategy <topics-http-reversing-url-namespaces>`
- for more information.
-
- .. deprecated:: 1.8
-
- The ``current_app`` argument is deprecated. Instead you should set
- ``request.current_app``.
-
``charset``
The charset in which the response will be encoded. If not given it will
be extracted from ``content_type``, and if that is unsuccessful, the
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 5f6e12934c..ba649aa60f 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -194,7 +194,7 @@ Once you have a compiled :class:`Template` object, you can render a context
with it. You can reuse the same template to render it several times with
different contexts.
-.. class:: Context(dict_=None, current_app=_current_app_undefined)
+.. class:: Context(dict_=None)
This class lives at ``django.template.Context``. The constructor takes
two optional arguments:
@@ -205,11 +205,6 @@ different contexts.
to help :ref:`resolve namespaced URLs<topics-http-reversing-url-namespaces>`.
If you're not using namespaced URLs, you can ignore this argument.
- .. deprecated:: 1.8
-
- The ``current_app`` argument is deprecated. If you need it, you must
- now use a :class:`RequestContext` instead of a :class:`Context`.
-
For details, see :ref:`playing-with-context` below.
.. method:: Template.render(context)