diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 6 | ||||
| -rw-r--r-- | docs/ref/class-based-views/mixins-editing.txt | 4 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/meta.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/ref/templates/builtins.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/upgrading.txt | 2 | ||||
| -rw-r--r-- | docs/ref/urls.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.8.3.txt | 5 | ||||
| -rw-r--r-- | docs/releases/1.8.txt | 44 | ||||
| -rw-r--r-- | docs/topics/auth/default.txt | 4 | ||||
| -rw-r--r-- | docs/topics/http/shortcuts.txt | 4 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 2 | ||||
| -rw-r--r-- | docs/topics/templates.txt | 2 |
14 files changed, 46 insertions, 41 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 8329309727..7374029256 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -7,10 +7,10 @@ in a backward incompatible way, following their deprecation, as per the :ref:`deprecation policy <internal-release-deprecation-policy>`. More details about each item can often be found in the release notes of two versions prior. -.. _deprecation-removed-in-2.0: +.. _deprecation-removed-in-1.10: -2.0 ---- +1.10 +---- See the :ref:`Django 1.8 release notes<deprecated-features-1.8>` for more details on these changes. diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt index 024b89cd2b..85a868ea18 100644 --- a/docs/ref/class-based-views/mixins-editing.txt +++ b/docs/ref/class-based-views/mixins-editing.txt @@ -157,7 +157,7 @@ ModelFormMixin Support for the new brace-based Python formatting syntax has been added. The old ``%(slug)s`` placeholder syntax support has been - deprecated and will be removed in Django 2.0. + deprecated and will be removed in Django 1.10. .. method:: get_form_class() @@ -251,7 +251,7 @@ DeletionMixin Support for the new brace-based Python formatting syntax has been added. The old ``%(slug)s`` placeholder syntax support has been - deprecated and will be removed in Django 2.0. + deprecated and will be removed in Django 1.10. .. method:: get_success_url() diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 55a8bc049e..b6cb05b847 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -852,7 +852,7 @@ For each field, we describe the default widget used if you don't specify .. deprecated:: 1.8 The optional argument ``error_message`` is also accepted for backwards - compatibility but will be removed in Django 2.0. The preferred way to + compatibility but will be removed in Django 1.10. The preferred way to provide an error message is to use the :attr:`~Field.error_messages` argument, passing a dictionary with ``'invalid'`` as a key and the error message as the value. diff --git a/docs/ref/models/meta.txt b/docs/ref/models/meta.txt index d972e9b5eb..d8f711b810 100644 --- a/docs/ref/models/meta.txt +++ b/docs/ref/models/meta.txt @@ -151,7 +151,7 @@ Migrating from the old API As part of the formalization of the ``Model._meta`` API (from the :class:`django.db.models.options.Options` class), a number of methods and -properties have been deprecated and will be removed in Django 2.0. +properties have been deprecated and will be removed in Django 1.10. These old APIs can be replicated by either: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 8c865edb71..53a5dda00c 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -126,7 +126,7 @@ Default: ``()`` (Empty tuple) .. deprecated:: 1.8 This setting, along with the :ttag:`ssi` template tag, is deprecated and - will be removed in Django 2.0. + will be removed in Django 1.10. .. versionchanged:: 1.8 diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 1caec9a634..b4ca36b5e4 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -990,7 +990,7 @@ ssi .. deprecated:: 1.8 - This tag has been deprecated and will be removed in Django 2.0. Use the + This tag has been deprecated and will be removed in Django 1.10. Use the :ttag:`include` tag instead. Outputs the contents of a given file into the page. @@ -1135,7 +1135,7 @@ by the context as to the current application. .. deprecated:: 1.8 The dotted Python path syntax is deprecated and will be removed in - Django 2.0:: + Django 1.10:: {% url 'path.to.some_view' v1 v2 %} @@ -2327,7 +2327,7 @@ contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then An older, more restrictive and verbose input format is also supported: ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``. - Support for this syntax will be removed in Django 2.0. + Support for this syntax will be removed in Django 1.10. .. templatefilter:: upper diff --git a/docs/ref/templates/upgrading.txt b/docs/ref/templates/upgrading.txt index 33057d36bd..887c2719e7 100644 --- a/docs/ref/templates/upgrading.txt +++ b/docs/ref/templates/upgrading.txt @@ -150,7 +150,7 @@ You should write:: Passing a :class:`~django.template.Context` or a :class:`~django.template.RequestContext` is still possible when the template is loaded by a :class:`~django.template.backends.django.DjangoTemplates` -backend but it's deprecated and won't be supported in Django 2.0. +backend but it's deprecated and won't be supported in Django 1.10. If you're loading a template while you're rendering another template with the Django template language and you have access to the current context, for diff --git a/docs/ref/urls.txt b/docs/ref/urls.txt index 222f41a76e..073db4c00c 100644 --- a/docs/ref/urls.txt +++ b/docs/ref/urls.txt @@ -119,7 +119,7 @@ parameter is useful. .. deprecated:: 1.8 Support for string ``view`` arguments is deprecated and will be removed in - Django 2.0. Pass the callable instead. + Django 1.10. Pass the callable instead. The ``prefix`` parameter has the same meaning as the first argument to ``patterns()`` and is only relevant when you're passing a string as the diff --git a/docs/releases/1.8.3.txt b/docs/releases/1.8.3.txt index 90008e184e..38bcaf5374 100644 --- a/docs/releases/1.8.3.txt +++ b/docs/releases/1.8.3.txt @@ -6,6 +6,11 @@ Django 1.8.3 release notes Django 1.8.3 fixes several bugs in 1.8.2. +Also, ``django.utils.deprecation.RemovedInDjango20Warning`` was renamed to +``RemovedInDjango110Warning`` as the version roadmap was revised to 1.9, 1.10, +1.11 (LTS), 2.0 (drops Python 2 support). For backwards compatibility, +``RemovedInDjango20Warning`` remains as an importable alias. + Bugfixes ======== diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index 5dee5671a9..2b755ef7c7 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -379,7 +379,7 @@ Generic Views * Placeholders in :attr:`ModelFormMixin.success_url <django.views.generic.edit.ModelFormMixin.success_url>` now support the Python :py:meth:`str.format()` syntax. The legacy ``%(<foo>)s`` syntax is still - supported but will be removed in Django 2.0. + supported but will be removed in Django 1.10. Internationalization ^^^^^^^^^^^^^^^^^^^^ @@ -1182,7 +1182,7 @@ Selected methods in ``django.db.models.options.Options`` As part of the formalization of the ``Model._meta`` API (from the :class:`django.db.models.options.Options` class), a number of methods have been -deprecated and will be removed in Django 2.0: +deprecated and will be removed in Django 1.10: * ``get_all_field_names()`` * ``get_all_related_objects()`` @@ -1203,7 +1203,7 @@ Loading ``cycle`` and ``firstof`` template tags from ``future`` library Django 1.6 introduced ``{% load cycle from future %}`` and ``{% load firstof from future %}`` syntax for forward compatibility of the :ttag:`cycle` and :ttag:`firstof` template tags. This syntax is now deprecated -and will be removed in Django 2.0. You can simply remove the +and will be removed in Django 1.10. You can simply remove the ``{% load ... from future %}`` tags. ``django.conf.urls.patterns()`` @@ -1289,7 +1289,7 @@ Built-in template context processors have been moved to The attribute :attr:`SimpleTestCase.urls <django.test.SimpleTestCase.urls>` for specifying URLconf configuration in tests has been deprecated and will be -removed in Django 2.0. Use :func:`@override_settings(ROOT_URLCONF=...) +removed in Django 1.10. Use :func:`@override_settings(ROOT_URLCONF=...) <django.test.override_settings>` instead. ``prefix`` argument to :func:`~django.conf.urls.i18n.i18n_patterns` @@ -1303,7 +1303,7 @@ Using an incorrect count of unpacked values in the :ttag:`for` template tag ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Using an incorrect count of unpacked values in :ttag:`for` tag will raise an -exception rather than fail silently in Django 2.0. +exception rather than fail silently in Django 1.10. Passing a dotted path to :func:`~django.core.urlresolvers.reverse()` and :ttag:`url` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1321,7 +1321,7 @@ the ``url`` that references :func:`django.contrib.sitemaps.views.sitemap`:: url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap') -to ensure compatibility when reversing by Python path is removed in Django 2.0. +to ensure compatibility when reversing by Python path is removed in Django 1.10. Similarly for GIS sitemaps, add ``name='django.contrib.gis.sitemaps.views.kml'`` or ``name='django.contrib.gis.sitemaps.views.kmz'``. @@ -1335,7 +1335,7 @@ The ``django.db.models.sql.aggregates`` and ``django.contrib.gis.db.models.sql.aggregates`` modules (both private API), have been deprecated as ``django.db.models.aggregates`` and ``django.contrib.gis.db.models.aggregates`` are now also responsible -for SQL generation. The old modules will be removed in Django 2.0. +for SQL generation. The old modules will be removed in Django 1.10. If you were using the old modules, see :doc:`Query Expressions </ref/models/expressions>` for instructions on rewriting custom aggregates @@ -1343,7 +1343,7 @@ using the new stable API. The following methods and properties of ``django.db.models.sql.query.Query`` have also been deprecated and the backwards compatibility shims will be removed -in Django 2.0: +in Django 1.10: * ``Query.aggregates``, replaced by ``annotations``. * ``Query.aggregate_select``, replaced by ``annotation_select``. @@ -1366,14 +1366,14 @@ arguments through ``argparse.add_argument()``. See ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The class :class:`~django.core.management.NoArgsCommand` is now deprecated and -will be removed in Django 2.0. Use :class:`~django.core.management.BaseCommand` +will be removed in Django 1.10. Use :class:`~django.core.management.BaseCommand` instead, which takes no arguments by default. Listing all migrations in a project ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ``--list`` option of the :djadmin:`migrate` management command is -deprecated and will be removed in Django 2.0. Use :djadmin:`showmigrations` +deprecated and will be removed in Django 1.10. Use :djadmin:`showmigrations` instead. ``cache_choices`` option of ``ModelChoiceField`` and ``ModelMultipleChoiceField`` @@ -1421,7 +1421,7 @@ Using the new syntax, this becomes:: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Rename this method to :meth:`~django.forms.Field.has_changed` by removing the -leading underscore. The old name will still work until Django 2.0. +leading underscore. The old name will still work until Django 1.10. ``django.utils.html.remove_tags()`` and ``removetags`` template filter ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1443,7 +1443,7 @@ It's a legacy option that should no longer be necessary. ~~~~~~~~~~~~~~~~ ``django.db.models.fields.subclassing.SubfieldBase`` has been deprecated and -will be removed in Django 2.0. Historically, it was used to handle fields where +will be removed in Django 1.10. Historically, it was used to handle fields where type conversion was needed when loading from the database, but it was not used in ``.values()`` calls or in aggregates. It has been replaced with :meth:`~django.db.models.Field.from_db_value`. Note that the new approach does @@ -1454,7 +1454,7 @@ as was the case with ``SubfieldBase``. ~~~~~~~~~~~~~~~~~~~~~~~~~~ The ``django.utils.checksums`` module has been deprecated and will be removed -in Django 2.0. The functionality it provided (validating checksum using the +in Django 1.10. The functionality it provided (validating checksum using the Luhn algorithm) was undocumented and not used in Django. The module has been moved to the `django-localflavor`_ package (version 1.1+). @@ -1464,7 +1464,7 @@ moved to the `django-localflavor`_ package (version 1.1+). ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ``original_content_type_id`` attribute on ``InlineAdminForm`` has been -deprecated and will be removed in Django 2.0. Historically, it was used +deprecated and will be removed in Django 1.10. Historically, it was used to construct the "view on site" URL. This URL is now accessible using the ``absolute_url`` attribute of the form. @@ -1511,7 +1511,7 @@ for details. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The following functions and classes will no longer accept a ``current_app`` -parameter to set an URL namespace in Django 2.0: +parameter to set an URL namespace in Django 1.10: * ``django.shortcuts.render()`` * ``django.template.Context()`` @@ -1526,7 +1526,7 @@ to these functions or classes. If you're using a plain ``Context``, use a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The following functions will no longer accept the ``dictionary`` and -``context_instance`` parameters in Django 2.0: +``context_instance`` parameters in Django 1.10: * ``django.shortcuts.render()`` * ``django.shortcuts.render_to_response()`` @@ -1544,7 +1544,7 @@ pass a :class:`dict` in the ``context`` parameter instead. If you're passing a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The following functions will no longer accept a ``dirs`` parameter to override -``TEMPLATE_DIRS`` in Django 2.0: +``TEMPLATE_DIRS`` in Django 1.10: * :func:`django.template.loader.get_template()` * :func:`django.template.loader.select_template()` @@ -1576,7 +1576,7 @@ Support for the ``max_length`` argument on custom ``Storage`` classes :meth:`~django.core.files.storage.Storage.get_available_name` and/or :meth:`~django.core.files.storage.Storage.save` if they override either method. Support for storages that do not accept this argument will be removed in -Django 2.0. +Django 1.10. ``qn`` replaced by ``compiler`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1608,7 +1608,7 @@ added in Django 1.7. In Django 1.7.2, its functionality was moved to ``'django.contrib.auth.middleware.SessionAuthenticationMiddleware'`` appears in :setting:`MIDDLEWARE_CLASSES`. -In Django 2.0, session verification will be enabled regardless of whether or not +In Django 1.10, session verification will be enabled regardless of whether or not ``SessionAuthenticationMiddleware`` is enabled (at which point ``SessionAuthenticationMiddleware`` will have no significance). You can add it to your ``MIDDLEWARE_CLASSES`` sometime before then to opt-in. Please read the @@ -1629,7 +1629,7 @@ of ``Field.rel``. The latter is an instance of ``django.db.models.fields.related.ForeignObjectRel`` which replaces ``django.db.models.related.RelatedObject``. The ``django.db.models.related`` module has been removed and the ``Field.related`` attribute will be removed in -Django 2.0. +Django 1.10. ``ssi`` template tag ~~~~~~~~~~~~~~~~~~~~ @@ -1637,7 +1637,7 @@ Django 2.0. The :ttag:`ssi` template tag allows files to be included in a template by absolute path. This is of limited use in most deployment situations, and the :ttag:`include` tag often makes more sense. This tag is now deprecated and -will be removed in Django 2.0. +will be removed in Django 1.10. ``=`` as comparison operator in ``if`` template tag ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1650,7 +1650,7 @@ testing was undocumented and untested. It's now deprecated in favor of ``==``. The legacy ``%(<foo>)s`` syntax in :attr:`ModelFormMixin.success_url <django.views.generic.edit.ModelFormMixin.success_url>` is deprecated and -will be removed in Django 2.0. +will be removed in Django 1.10. ``GeoQuerySet`` aggregate methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 9a5ebd5454..31460db03a 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -621,7 +621,7 @@ Session invalidation on password change is enabled in :setting:`MIDDLEWARE_CLASSES`. It's included if ``settings.py`` was generated by :djadmin:`startproject` on Django ≥ 1.7. - Session verification will become mandatory in Django 2.0 regardless of + Session verification will become mandatory in Django 1.10 regardless of whether or not ``SessionAuthenticationMiddleware`` is enabled. If you have a pre-1.7 project or one generated using a template that doesn't include ``SessionAuthenticationMiddleware``, consider enabling it before then after @@ -1076,7 +1076,7 @@ implementation details see :ref:`using-the-views`. .. deprecated:: 1.8 The ``is_admin_site`` argument is deprecated and will be removed in - Django 2.0. + Django 1.10. **Template context:** diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt index 3f3db308d9..e0fc3aa573 100644 --- a/docs/topics/http/shortcuts.txt +++ b/docs/topics/http/shortcuts.txt @@ -49,7 +49,7 @@ Optional arguments .. versionchanged:: 1.8 The ``context`` argument used to be called ``dictionary``. That name - is deprecated in Django 1.8 and will be removed in Django 2.0. + is deprecated in Django 1.8 and will be removed in Django 1.10. ``context_instance`` The context instance to render the template with. By default, the template @@ -146,7 +146,7 @@ Optional arguments .. versionchanged:: 1.8 The ``context`` argument used to be called ``dictionary``. That name - is deprecated in Django 1.8 and will be removed in Django 2.0. + is deprecated in Django 1.8 and will be removed in Django 1.10. ``context_instance`` The context instance to render the template with. By default, the template diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 9220cda737..ede30bde9f 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1236,7 +1236,7 @@ Language prefix in URL patterns .. deprecated:: 1.8 The ``prefix`` argument to ``i18n_patterns()`` has been deprecated and will - not be supported in Django 2.0. Simply pass a list of + not be supported in Django 1.10. Simply pass a list of :func:`django.conf.urls.url` instances instead. This function can be used in your root URLconf and Django will automatically diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt index 7a0fc77373..2bb3606d19 100644 --- a/docs/topics/templates.txt +++ b/docs/topics/templates.txt @@ -273,7 +273,7 @@ templates, Django provides a shortcut function which automates the process. .. versionchanged:: 1.8 The ``context`` argument used to be called ``dictionary``. That name - is deprecated in Django 1.8 and will be removed in Django 2.0. + is deprecated in Django 1.8 and will be removed in Django 1.10. ``context`` is now optional. An empty context will be used if it isn't provided. |