no need for obsolete (and hard to find) sqlite module when sqlite3 handles both database versions

This commit is contained in:
Miroslav Stampar 2010-08-31 13:37:53 +00:00
parent 27496b91b2
commit e810fe7b0b
2 changed files with 4 additions and 12 deletions

View File

@ -684,7 +684,7 @@ def parseTargetDirect():
"MySQL": [MYSQL_ALIASES, "python-mysqldb", "http://mysql-python.sourceforge.net/"], "MySQL": [MYSQL_ALIASES, "python-mysqldb", "http://mysql-python.sourceforge.net/"],
"PostgreSQL": [PGSQL_ALIASES, "python-psycopg2", "http://initd.org/psycopg/"], "PostgreSQL": [PGSQL_ALIASES, "python-psycopg2", "http://initd.org/psycopg/"],
"Oracle": [ORACLE_ALIASES, "python cx_Oracle", "http://cx-oracle.sourceforge.net/"], "Oracle": [ORACLE_ALIASES, "python cx_Oracle", "http://cx-oracle.sourceforge.net/"],
"SQLite": [SQLITE_ALIASES, "python-pysqlite2 and python-sqlite", "http://pysqlite.googlecode.com/"], "SQLite": [SQLITE_ALIASES, "python-pysqlite2", "http://pysqlite.googlecode.com/"],
"Access": [ACCESS_ALIASES, "python-pyodbc", "http://pyodbc.googlecode.com/"], "Access": [ACCESS_ALIASES, "python-pyodbc", "http://pyodbc.googlecode.com/"],
"Firebird": [FIREBIRD_ALIASES, "python-kinterbasdb", "http://kinterbasdb.sourceforge.net/"] } "Firebird": [FIREBIRD_ALIASES, "python-kinterbasdb", "http://kinterbasdb.sourceforge.net/"] }
@ -720,7 +720,6 @@ def parseTargetDirect():
elif dbmsName == "Oracle": elif dbmsName == "Oracle":
import cx_Oracle import cx_Oracle
elif dbmsName == "SQLite": elif dbmsName == "SQLite":
import sqlite
import sqlite3 import sqlite3
elif dbmsName == "Access": elif dbmsName == "Access":
import pyodbc import pyodbc

View File

@ -23,7 +23,6 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
""" """
try: try:
import sqlite
import sqlite3 import sqlite3
except ImportError, _: except ImportError, _:
pass pass
@ -54,15 +53,9 @@ class Connector(GenericConnector):
self.checkFileDb() self.checkFileDb()
try: try:
self.connector = sqlite.connect(database=self.db, check_same_thread=False, timeout=conf.timeout) self.connector = sqlite3.connect(database=self.db, check_same_thread=False, timeout=conf.timeout)
except (sqlite.DatabaseError, sqlite.OperationalError), _: except (sqlite3.DatabaseError, sqlite3.OperationalError), msg:
errMsg = "unable to connect using SQLite 2 library, trying with SQLite 3" raise sqlmapConnectionException, msg[0]
logger.error(errMsg)
try:
self.connector = sqlite3.connect(database=self.db, check_same_thread=False, timeout=conf.timeout)
except (sqlite.DatabaseError, sqlite.OperationalError), msg:
raise sqlmapConnectionException, msg[0]
self.setCursor() self.setCursor()
self.connected() self.connected()