From 7852825eeba42865492c99fec7947565f65cecc7 Mon Sep 17 00:00:00 2001 From: amishurov Date: Tue, 7 Oct 2014 15:54:08 +0400 Subject: [PATCH] Refactor connect func --- lib/__init__.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/__init__.py b/lib/__init__.py index cf8c06ae..70477431 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -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])