diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2015-02-14 17:31:53 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2015-02-14 18:51:18 +0100 |
| commit | a73c8540a888021feb640abefa936a76e21b6a1a (patch) | |
| tree | e690502c8450dcd0c4147e55797c84d4657f222a /django/db/backends/postgresql_psycopg2/base.py | |
| parent | 28e97a9bdc6c672a1304570aa75f6311fb1112e2 (diff) | |
Removed 'autocommit' options for the psycopg2 backend.
It was documented as not having any effect since Django 1.6.
Diffstat (limited to 'django/db/backends/postgresql_psycopg2/base.py')
| -rw-r--r-- | django/db/backends/postgresql_psycopg2/base.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index 2efb904997..5f7ca69611 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -146,10 +146,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): 'database': settings_dict['NAME'] or 'postgres', } conn_params.update(settings_dict['OPTIONS']) - if 'autocommit' in conn_params: - del conn_params['autocommit'] - if 'isolation_level' in conn_params: - del conn_params['isolation_level'] + conn_params.pop('isolation_level', None) if settings_dict['USER']: conn_params['user'] = settings_dict['USER'] if settings_dict['PASSWORD']: |