summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-03-07 14:09:52 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-03-11 15:04:10 +0100
commit557e40412729c06a2daff34a4cabcb6efb719b32 (patch)
tree9630a558c19ed1ae31e88fffd62b3ada01f4c8f1
parentac37ed21b3d66dde1748f6edf3279656b0267b70 (diff)
Re-ordered functions by deprecation status.
-rw-r--r--django/db/transaction.py37
1 files changed, 20 insertions, 17 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py
index 0799d23bb6..a6eb0662d4 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -39,17 +39,9 @@ def get_connection(using=None):
using = DEFAULT_DB_ALIAS
return connections[using]
-def get_autocommit(using=None):
- """
- Get the autocommit status of the connection.
- """
- return get_connection(using).autocommit
-
-def set_autocommit(using=None, autocommit=True):
- """
- Set the autocommit status of the connection.
- """
- return get_connection(using).set_autocommit(autocommit)
+###########################
+# Deprecated private APIs #
+###########################
def abort(using=None):
"""
@@ -106,12 +98,6 @@ def set_clean(using=None):
"""
get_connection(using).set_clean()
-def clean_savepoints(using=None):
- """
- Resets the counter used to generate unique savepoint ids in this thread.
- """
- get_connection(using).clean_savepoints()
-
def is_managed(using=None):
warnings.warn("'is_managed' is deprecated.",
PendingDeprecationWarning, stacklevel=2)
@@ -132,6 +118,18 @@ def rollback_unless_managed(using=None):
# Public APIs #
###############
+def get_autocommit(using=None):
+ """
+ Get the autocommit status of the connection.
+ """
+ return get_connection(using).autocommit
+
+def set_autocommit(using=None, autocommit=True):
+ """
+ Set the autocommit status of the connection.
+ """
+ return get_connection(using).set_autocommit(autocommit)
+
def commit(using=None):
"""
Commits a transaction and resets the dirty flag.
@@ -166,6 +164,11 @@ def savepoint_commit(sid, using=None):
"""
get_connection(using).savepoint_commit(sid)
+def clean_savepoints(using=None):
+ """
+ Resets the counter used to generate unique savepoint ids in this thread.
+ """
+ get_connection(using).clean_savepoints()
#################################
# Decorators / context managers #