Make backwards compatible with nacl 1.0.x

[securemail.git] / db.py

diff --git a/db.py b/db.py
index cabd8bf1da347429613491854d6b8b9d39d21447..93eea0991bfd8ac4ca8697bad8fafbd6adba0af5 100644 (file)
--- a/db.py
+++ b/db.py
@@ -79,7 +79,7 @@ class DB:
         if self.conn is None:
             if DBTYPE == 'mysql':
                 import MySQLdb
-                self.conn = MySQLdb.connect(host=DBHOST, port=DBPORT, user=DBUID, password=DBPWD, database=DBNAME)
+                self.conn = MySQLdb.connect(host=DBHOST, port=DBPORT, user=DBUID, passwd=DBPWD, db=DBNAME)
             elif DBTYPE == 'postgresql':
                 import psycopg2
                 self.conn = psycopg2.connect(host=DBHOST, port=DBPORT, user=DBUID, password=DBPWD, dbname=DBNAME)
@@ -163,7 +163,6 @@ class DBInterface:
                 cursor.execute(sqlite_sql)
                 cursor.execute('commit')
         except DBError as e:
-            print (e)
             if DBTYPE != 'sqlite':
                 conn.rollback()
             else: