psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-08-04 04:10:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 7852825eeb into 1b48033345

Browse Source
This commit is contained in:
Alexander Mishurov 2014-10-07 11:58:07 +00:00
commit 691dabb65b
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/__init__.py
View File

@ -136,16 +136,9 @@ def connect(dsn=None,
"""
items = []
if database is not None:
items.append(('dbname', database))
if user is not None:
items.append(('user', user))
if password is not None:
items.append(('password', password))
if host is not None:
items.append(('host', host))
if port is not None:
items.append(('port', port))
for name, value in (('dbname', database), ('user', user), ('password', password), ('host', host), ('port', port)):
if value is not None:
items.append((name, value))
items.extend([(k, v) for (k, v) in kwargs.iteritems() if v is not None])