From 06160cb945e35f7d58e2313e23fb6be70d5b47b7 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Fri, 21 Mar 2014 21:34:35 +0100
Subject: [PATCH] Removed deprecated TRANSACTIONS_MANAGED setting.

---
 django/conf/global_settings.py |  4 ----
 django/db/utils.py             |  7 +------
 docs/ref/settings.txt          | 17 -----------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 2ced8107a6..374b5587b5 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -420,10 +420,6 @@ NUMBER_GROUPING = 0
 # Thousand separator symbol
 THOUSAND_SEPARATOR = ','
 
-# Do you want to manage transactions manually?
-# Hint: you really don't!
-TRANSACTIONS_MANAGED = False
-
 # The tablespaces to use for each model when not specified otherwise.
 DEFAULT_TABLESPACE = ''
 DEFAULT_INDEX_TABLESPACE = ''
diff --git a/django/db/utils.py b/django/db/utils.py
index 7f19256425..037f34f700 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -6,7 +6,7 @@ import warnings
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.deprecation import RemovedInDjango18Warning, RemovedInDjango19Warning
+from django.utils.deprecation import RemovedInDjango19Warning
 from django.utils.functional import cached_property
 from django.utils.module_loading import import_string
 from django.utils._os import upath
@@ -167,11 +167,6 @@ class ConnectionHandler(object):
             raise ConnectionDoesNotExist("The connection %s doesn't exist" % alias)
 
         conn.setdefault('ATOMIC_REQUESTS', False)
-        if settings.TRANSACTIONS_MANAGED:
-            warnings.warn(
-                "TRANSACTIONS_MANAGED is deprecated. Use AUTOCOMMIT instead.",
-                RemovedInDjango18Warning, stacklevel=2)
-            conn.setdefault('AUTOCOMMIT', False)
         conn.setdefault('AUTOCOMMIT', True)
         conn.setdefault('ENGINE', 'django.db.backends.dummy')
         if conn['ENGINE'] == 'django.db.backends.' or not conn['ENGINE']:
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 62b510bf7b..21c5c96c61 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2178,22 +2178,6 @@ to ensure your processes are running in the correct environment.
 
 .. _pytz: http://pytz.sourceforge.net/
 
-.. setting:: TRANSACTIONS_MANAGED
-
-TRANSACTIONS_MANAGED
---------------------
-
-.. deprecated:: 1.6
-
-    This setting was deprecated because its name is very misleading. Use the
-    :setting:`AUTOCOMMIT <DATABASE-AUTOCOMMIT>` key in :setting:`DATABASES`
-    entries instead.
-
-Default: ``False``
-
-Set this to ``True`` if you want to :ref:`disable Django's transaction
-management <deactivate-transaction-management>` and implement your own.
-
 .. setting:: USE_ETAGS
 
 USE_ETAGS
@@ -2869,7 +2853,6 @@ Database
 * :setting:`DATABASE_ROUTERS`
 * :setting:`DEFAULT_INDEX_TABLESPACE`
 * :setting:`DEFAULT_TABLESPACE`
-* :setting:`TRANSACTIONS_MANAGED`
 
 Debugging
 ---------