Merge pull request #177 from benthepoet/master

FirebirdDB __init__ needs to be fixed
webpy · Aug 20, 2012 · 875ef3d · 875ef3d
2 parents 914ceb7 + 6e36b87
commit 875ef3d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/web/db.py b/web/db.py
@@ -1044,10 +1044,11 @@ def __init__(self, **keywords):
             db = None
             pass
         if 'pw' in keywords:
-            keywords['passwd'] = keywords['pw']
+            keywords['password'] = keywords.pop('pw')
-            del keywords['pw']
+        keywords['database'] = keywords.pop('db')
-        keywords['database'] = keywords['db']
+
-        del keywords['db']
+        self.paramstyle = db.paramstyle
+
         DB.__init__(self, db, keywords)
 
     def delete(self, table, where=None, using=None, vars=None, _test=False):