diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 4 | ||||
| -rw-r--r-- | docs/ref/request-response.txt | 3 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 15 |
3 files changed, 22 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index b584a28ba1..bf26d8d855 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -469,6 +469,10 @@ these changes. * ``django.forms.get_declared_fields`` will be removed. +* The ``WSGIRequest.REQUEST`` property will be removed. + +* The class ``django.utils.datastructures.MergeDict`` will be removed. + 2.0 --- diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 57222c8ca7..e5ded0c9e0 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -110,6 +110,9 @@ All attributes should be considered read-only, unless stated otherwise below. .. attribute:: HttpRequest.REQUEST + .. deprecated:: 1.7 + Use the more explicit ``GET`` and ``POST`` instead. + For convenience, a dictionary-like object that searches ``POST`` first, then ``GET``. Inspired by PHP's ``$_REQUEST``. diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index aa613c4538..d5c1f886da 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -639,3 +639,18 @@ deprecated. Use :djadminopt:`--natural-foreign` instead. Similarly, the ``use_natural_keys`` argument for ``serializers.serialize()`` has been deprecated. Use ``use_natural_foreign_keys`` instead. + +Merging of ``POST`` and ``GET`` arguments into ``WSGIRequest.REQUEST`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +It was already strongly suggested that you use ``GET`` and ``POST`` instead of +``REQUEST``, because the former are more explicit. The property ``REQUEST`` is +deprecated and will be removed in Django 1.9. + +``django.utils.datastructures.MergeDict`` class +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +``MergeDict`` exists primarily to support merging ``POST`` and ``GET`` +arguments into a ``REQUEST`` property on ``WSGIRequest``. To merge +dictionaries, use ``dict.update()`` instead. The class ``MergeDict`` is +deprecated and will be removed in Django 1.9. |