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

stamparm · stamparm · commit e810fe7b0b0b · 2010-08-31T13:37:53.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -684,7 +684,7 @@ def parseTargetDirect():
                  "MySQL": [MYSQL_ALIASES, "python-mysqldb", "http://mysql-python.sourceforge.net/"],
                  "PostgreSQL": [PGSQL_ALIASES, "python-psycopg2", "http://initd.org/psycopg/"],
                  "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/"],
                  "Firebird": [FIREBIRD_ALIASES, "python-kinterbasdb", "http://kinterbasdb.sourceforge.net/"] }
 
@@ -720,7 +720,6 @@ def parseTargetDirect():
                 elif dbmsName == "Oracle":
                     import cx_Oracle
                 elif dbmsName == "SQLite":
-                    import sqlite
                     import sqlite3
                 elif dbmsName == "Access":
                     import pyodbc
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
@@ -23,7 +23,6 @@
 """
 
 try:
-    import sqlite
     import sqlite3
 except ImportError, _:
     pass
@@ -54,15 +53,9 @@ def connect(self):
         self.checkFileDb()
 
         try:
-            self.connector = sqlite.connect(database=self.db, check_same_thread=False, timeout=conf.timeout)
-        except (sqlite.DatabaseError, sqlite.OperationalError), _:
-            errMsg = "unable to connect using SQLite 2 library, trying with SQLite 3"
-            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.connector = sqlite3.connect(database=self.db, check_same_thread=False, timeout=conf.timeout)
+        except (sqlite3.DatabaseError, sqlite3.OperationalError), msg:
+            raise sqlmapConnectionException, msg[0]
 
         self.setCursor()
         self.connected()
