Merge branch 'master' of git://git.assembla.com/fpdb-eric

This commit is contained in:
Worros
2009-10-28 00:20:44 +08:00
+4 -3
View File
@@ -77,10 +77,11 @@ class fpdb_db:
import MySQLdb
if use_pool:
MySQLdb = pool.manage(MySQLdb, pool_size=5)
try:
# try:
self.db = MySQLdb.connect(host = host, user = user, passwd = password, db = database, use_unicode=True)
except:
raise FpdbMySQLFailedError("MySQL connection failed")
#TODO: Add port option
# except:
# raise FpdbMySQLFailedError("MySQL connection failed")
elif backend==fpdb_db.PGSQL:
import psycopg2
import psycopg2.extensions