merge from Eric

This commit is contained in:
sqlcoder
2009-09-26 11:45:05 +01:00
19 changed files with 485 additions and 256 deletions
+8 -10
View File
@@ -49,22 +49,20 @@ log = logging.getLogger('importer')
# database interface modules
try:
import MySQLdb
mysqlLibFound=True
log.debug("Import module: MySQLdb")
except:
log.debug("Import module: MySQLdb not found")
except ImportError:
log.debug("Import database module: MySQLdb not found")
else:
mysqlLibFound = True
try:
import psycopg2
pgsqlLibFound=True
except ImportError:
log.debug("Import database module: psycopg2 not found")
else:
import psycopg2.extensions
psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
log.debug("Import module: psycopg2")
except:
log.debug("Import module: psycopg2 not found")
class Importer:
def __init__(self, caller, settings, config, sql = None):
"""Constructor"""
self.settings = settings