diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 3 | ||||
| -rw-r--r-- | docs/ref/class-based-views/base.txt | 12 | ||||
| -rw-r--r-- | docs/releases/3.1.1.txt | 4 | ||||
| -rw-r--r-- | docs/releases/3.1.txt | 4 |
4 files changed, 8 insertions, 15 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 1f1364897e..46a1aaaee6 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -98,9 +98,6 @@ details on these changes. * The ``list`` message for ``ModelMultipleChoiceField`` will be removed. -* ``django.views.generic.TemplateView`` will no longer pass URL kwargs directly - to the ``context``. - * Support for passing raw column aliases to ``QuerySet.order_by()`` will be removed. diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt index de45ae3a5e..7906c56846 100644 --- a/docs/ref/class-based-views/base.txt +++ b/docs/ref/class-based-views/base.txt @@ -117,7 +117,8 @@ MRO is an acronym for Method Resolution Order. .. class:: django.views.generic.base.TemplateView - Renders a given template. + Renders a given template, with the context containing parameters captured + in the URL. **Ancestors (MRO)** @@ -161,17 +162,12 @@ MRO is an acronym for Method Resolution Order. **Context** - * Populated (through :class:`~django.views.generic.base.ContextMixin`). + * Populated (through :class:`~django.views.generic.base.ContextMixin`) with + the keyword arguments captured from the URL pattern that served the view. * You can also add context using the :attr:`~django.views.generic.base.ContextMixin.extra_context` keyword argument for :meth:`~django.views.generic.base.View.as_view`. - .. deprecated:: 3.1 - - Starting in Django 4.0, the keyword arguments captured from the URL - pattern won't be passed to the context. Reference them with - ``view.kwargs`` instead. - ``RedirectView`` ================ diff --git a/docs/releases/3.1.1.txt b/docs/releases/3.1.1.txt index 0a0eeb461a..fd0843c2ae 100644 --- a/docs/releases/3.1.1.txt +++ b/docs/releases/3.1.1.txt @@ -31,3 +31,7 @@ Bugfixes * Fixed a regression in Django 3.1 that caused a crash when decoding an invalid session data (:ticket:`31895`). + +* Reverted a deprecation in Django 3.1 that caused a crash when passing + deprecated keyword arguments to a queryset in + ``TemplateView.get_context_data()`` (:ticket:`31877`). diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index 52e09b4d1d..a9ebe7b094 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -798,10 +798,6 @@ Miscellaneous * The ``list`` message for :class:`~django.forms.ModelMultipleChoiceField` is deprecated in favor of ``invalid_list``. -* The passing of URL kwargs directly to the context by - :class:`~django.views.generic.base.TemplateView` is deprecated. Reference - them in the template with ``view.kwargs`` instead. - * Passing raw column aliases to :meth:`.QuerySet.order_by` is deprecated. The same result can be achieved by passing aliases in a :class:`~django.db.models.expressions.RawSQL` instead beforehand. |