mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-08-04 04:10:09 +03:00
Merge 7852825eeb
into 1b48033345
This commit is contained in:
commit
691dabb65b
|
@ -136,16 +136,9 @@ def connect(dsn=None,
|
||||||
|
|
||||||
"""
|
"""
|
||||||
items = []
|
items = []
|
||||||
if database is not None:
|
for name, value in (('dbname', database), ('user', user), ('password', password), ('host', host), ('port', port)):
|
||||||
items.append(('dbname', database))
|
if value is not None:
|
||||||
if user is not None:
|
items.append((name, value))
|
||||||
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))
|
|
||||||
|
|
||||||
items.extend([(k, v) for (k, v) in kwargs.iteritems() if v is not None])
|
items.extend([(k, v) for (k, v) in kwargs.iteritems() if v is not None])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user