summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-03-02 20:25:25 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-03-11 14:48:53 +0100
commit7aacde84f2b499d9c35741cbfccb621af6b48903 (patch)
tree06b20c555a5110a5771ba75c05b7c904a97f8c2e /docs
parent9cec689e6a7e299b3416519ee075b2316ecc5a64 (diff)
Made transaction.managed a no-op and deprecated it.
enter_transaction_management() was nearly always followed by managed(). In three places it wasn't, but they will all be refactored eventually. The "forced" keyword argument avoids introducing behavior changes until then. This is mostly backwards-compatible, except, of course, for managed itself. There's a minor difference in _enter_transaction_management: the top self.transaction_state now contains the new 'managed' state rather than the previous one. Django doesn't access self.transaction_state in _enter_transaction_management.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index b5173af298..296f908a5b 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -339,8 +339,6 @@ these changes.
* ``Model._meta.module_name`` was renamed to ``model_name``.
-* The private API ``django.db.close_connection`` will be removed.
-
* Remove the backward compatible shims introduced to rename ``get_query_set``
and similar queryset methods. This affects the following classes:
``BaseModelAdmin``, ``ChangeList``, ``BaseCommentNode``,
@@ -350,6 +348,10 @@ these changes.
* Remove the backward compatible shims introduced to rename the attributes
``ChangeList.root_query_set`` and ``ChangeList.query_set``.
+* The private API ``django.db.close_connection`` will be removed.
+
+* The private API ``django.transaction.managed`` will be removed.
+
2.0
---