Taking some goodies from Pull request #284

plugins/dbms/access/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import pyodbc
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/db2/__init__.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
 """
-$Id$
-
 Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """

plugins/dbms/db2/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import ibm_db_dbi
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/db2/enumeration.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
 """
-$Id$
-
 Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """

plugins/dbms/db2/syntax.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
 """
-$Id$
-
 Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """

plugins/dbms/firebird/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import kinterbasdb
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/mssqlserver/connector.py

@@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission
 try:
     import _mssql
     import pymssql
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/mysql/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import pymysql
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/oracle/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import cx_Oracle
-except ImportError, _:
+except ImportError:
     pass
 
 import logging

plugins/dbms/oracle/enumeration.py

@@ -164,4 +164,4 @@ class Enumeration(GenericEnumeration):
             errMsg += "for the database users"
             raise sqlmapNoneDataException, errMsg
 
-        return ( kb.data.cachedUsersRoles, areAdmins )
+        return kb.data.cachedUsersRoles, areAdmins

plugins/dbms/postgresql/connector.py

@@ -10,7 +10,7 @@ try:
     import psycopg2.extensions
     psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
     psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
-except ImportError, _:
+except ImportError:
     pass
 
 from lib.core.data import logger

plugins/dbms/sqlite/connector.py

@@ -7,7 +7,7 @@ See the file 'doc/COPYING' for copying permission
 
 try:
     import sqlite3
-except ImportError, _:
+except ImportError:
     pass
 
 import logging
@@ -53,7 +53,7 @@ class Connector(GenericConnector):
             try:
                 try:
                     import sqlite
-                except ImportError, _:
+                except ImportError:
                     errMsg = "sqlmap requires 'python-sqlite2' third-party library "
                     errMsg += "in order to directly connect to the database '%s'" % self.db
                     raise sqlmapMissingDependence, errMsg

plugins/dbms/sybase/connector.py

@@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission
 try:
     import _mssql
     import pymssql
-except ImportError, _:
+except ImportError:
     pass
 
 import logging