summaryrefslogtreecommitdiff
path: root/lib/extensions.py
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-01 20:12:13 +0000
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-01 20:12:13 +0000
commit44d8edfd8c3bcaa3167e84fd11cc62b43bfd3af5 (patch)
tree0eb7221647e009e7b3675d63381cef500cccf08f /lib/extensions.py
parent455f51c36ce6100b0da816e0056af60fa978c8a6 (diff)
downloadpsycopg2-fix-517.tar.gz
Ignore None arguments passed to make_dsn()fix-517
Close #517.
Diffstat (limited to 'lib/extensions.py')
-rw-r--r--lib/extensions.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/extensions.py b/lib/extensions.py
index 9fee551..00d71f0 100644
--- a/lib/extensions.py
+++ b/lib/extensions.py
@@ -162,6 +162,9 @@ def make_dsn(dsn=None, **kwargs):
"you can't specify both 'database' and 'dbname' arguments")
kwargs['dbname'] = kwargs.pop('database')
+ # Drop the None arguments
+ kwargs = dict((k, v) for (k, v) in kwargs.iteritems() if v is not None)
+
if dsn is not None:
tmp = parse_dsn(dsn)
tmp.update(kwargs)