diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2015-02-14 17:31:53 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-17 06:21:37 -0500 |
| commit | d027993ed14df1f9e25f13d7da87db11447c8c95 (patch) | |
| tree | df898786155fa8ae24cd78075a80fc1a2c20ffc7 | |
| parent | 30e5356c2ecb220e0ac866a7860aefbc90b97aa0 (diff) | |
[1.8.x] Removed 'autocommit' options for the psycopg2 backend.
It was documented as not having any effect since Django 1.6.
Backport of a73c8540a888021feb640abefa936a76e21b6a1a from master
| -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']: |