From e27e4c03399f610e0db1fb9b881095d762fda2b7 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 2 Jan 2017 10:25:57 -0500 Subject: Removed versionadded/changed annotations for 1.10. --- docs/ref/models/database-functions.txt | 4 ---- docs/ref/models/expressions.txt | 7 ------- docs/ref/models/fields.txt | 4 ---- docs/ref/models/instances.txt | 11 ----------- docs/ref/models/options.txt | 4 ---- docs/ref/models/querysets.txt | 11 ----------- 6 files changed, 41 deletions(-) (limited to 'docs/ref/models') diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt index 231d023e11..18d547d906 100644 --- a/docs/ref/models/database-functions.txt +++ b/docs/ref/models/database-functions.txt @@ -28,8 +28,6 @@ allows the field to have two "empty values", but it's important for the .. class:: Cast(expression, output_field) -.. versionadded:: 1.10 - Forces the result type of ``expression`` to be the one from ``output_field``. Usage example:: @@ -281,8 +279,6 @@ Date Functions .. module:: django.db.models.functions.datetime -.. versionadded:: 1.10 - We'll be using the following model in examples of each function:: class Experiment(models.Model): diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index 01db103758..4ba63ba928 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -278,8 +278,6 @@ The ``Func`` API is as follows: .. attribute:: arity - .. versionadded:: 1.10 - A class attribute that denotes the number of arguments the function accepts. If this attribute is set and the function is called with a different number of expressions, ``TypeError`` will be raised. Defaults @@ -308,11 +306,6 @@ The ``Func`` API is as follows: template="%(function)s('', %(expressions)s)", ) - .. versionchanged:: 1.10 - - Support for the ``arg_joiner`` and ``**extra_context`` parameters - was added. - The ``*expressions`` argument is a list of positional expressions that the function will be applied to. The expressions will be converted to strings, joined together with ``arg_joiner``, and then interpolated into the ``template`` diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index 5e6e2e1c0e..fc4290edb7 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -401,8 +401,6 @@ otherwise. See :ref:`automatic-primary-key-fields`. .. class:: BigAutoField(**options) -.. versionadded:: 1.10 - A 64-bit integer, much like an :class:`AutoField` except that it is guaranteed to fit numbers from ``1`` to ``9223372036854775807``. @@ -1777,8 +1775,6 @@ Field API reference .. method:: rel_db_type(connection) - .. versionadded:: 1.10 - Returns the database column data type for fields such as ``ForeignKey`` and ``OneToOneField`` that point to the :class:`Field`, taking into account the ``connection``. diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index 3c1f2e051b..83f76f37ca 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -119,12 +119,6 @@ The example above shows a full ``from_db()`` implementation to clarify how that is done. In this case it would of course be possible to just use ``super()`` call in the ``from_db()`` method. -.. versionchanged:: 1.10 - - In older versions, you could check if all fields were loaded by consulting - ``cls._deferred``. This attribute is removed and - ``django.db.models.DEFERRED`` is new. - Refreshing objects from database ================================ @@ -135,11 +129,6 @@ value from the database:: >>> del obj.field >>> obj.field # Loads the field from the database -.. versionchanged:: 1.10 - - In older versions, accessing a deleted field raised ``AttributeError`` - instead of reloading it. - .. method:: Model.refresh_from_db(using=None, fields=None) If you need to reload a model's values from the database, you can use the diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt index 23ea0c673e..182c2f6c45 100644 --- a/docs/ref/models/options.txt +++ b/docs/ref/models/options.txt @@ -38,8 +38,6 @@ Available ``Meta`` options .. attribute:: Options.base_manager_name - .. versionadded:: 1.10 - The name of the manager to use for the model's :attr:`~django.db.models.Model._base_manager`. @@ -108,8 +106,6 @@ Django quotes column and table names behind the scenes. .. attribute:: Options.default_manager_name - .. versionadded:: 1.10 - The name of the manager to use for the model's :attr:`~django.db.models.Model._default_manager`. diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index ec71fe0294..ddacf25769 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1949,11 +1949,6 @@ This has a number of caveats though: unless the database backend supports it (currently PostgreSQL). * It does not work with many-to-many relationships. -.. versionchanged:: 1.10 - - Support for setting primary keys on objects created using ``bulk_create()`` - when using PostgreSQL was added. - The ``batch_size`` parameter controls how many objects are created in single query. The default is to create all objects in one batch, except for SQLite where the default is such that at most 999 variables per query are used. @@ -2011,10 +2006,6 @@ Example:: If you pass ``in_bulk()`` an empty list, you'll get an empty dictionary. -.. versionchanged:: 1.10 - - In older versions, ``id_list`` was a required argument. - ``iterator()`` ~~~~~~~~~~~~~~ @@ -3206,8 +3197,6 @@ attribute: .. function:: prefetch_related_objects(model_instances, *related_lookups) -.. versionadded:: 1.10 - Prefetches the given lookups on an iterable of model instances. This is useful in code that receives a list of model instances as opposed to a ``QuerySet``; for example, when fetching models from a cache or instantiating them manually. -- cgit v1.3