diff options
author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 21:34:35 +0100 |
---|---|---|
committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 21:34:47 +0100 |
commit | 06160cb945e35f7d58e2313e23fb6be70d5b47b7 (patch) | |
tree | eafc39c6d578ee3fd47e66c66100ebca34f1218d /django/db/utils.py | |
parent | 753a22a6352638b7df55176584795ac8c5d4232c (diff) | |
download | django-06160cb945e35f7d58e2313e23fb6be70d5b47b7.tar.gz |
Removed deprecated TRANSACTIONS_MANAGED setting.
Diffstat (limited to 'django/db/utils.py')
-rw-r--r-- | django/db/utils.py | 7 |
1 files changed, 1 insertions, 6 deletions
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']: |