Refactor connect func

This commit is contained in:
amishurov 2014-10-07 15:54:08 +04:00
parent 1b48033345
commit 7852825eeb

View File

@ -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])