mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-11 04:56:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.

Browse source
This commit is contained in:
Nick Pope 2017-12-11 12:08:45 +00:00 • committed by Tim Graham
parent a9e5ac823d
commit d13a9e44de
61 changed files with 511 additions and 564 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/db/backends/postgresql/base.py
View file

@ -151,8 +151,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
"Please supply the NAME value.")
conn_params = {
'database': settings_dict['NAME'] or 'postgres',
**settings_dict['OPTIONS'],
}
conn_params.update(settings_dict['OPTIONS'])
conn_params.pop('isolation_level', None)
if settings_dict['USER']:
conn_params['user'] = settings_dict['USER']