removing of unused imports together with some general code refactoring

2025-12-06 20:51:31 +00:00 · 2012-02-22 10:40:11 +00:00
parent 386e98a0e3
commit b3bd4144f5
104 changed files with 255 additions and 499 deletions
--- a/plugins/dbms/db2/connector.py
+++ b/plugins/dbms/db2/connector.py
@@ -1,63 +1,62 @@
-#!/usr/bin/env python
-
-"""
-$Id$
-
-Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
-See the file 'doc/COPYING' for copying permission
-"""
-
-try:
-    import ibm_db_dbi
-except ImportError, _:
-    pass
-
-from lib.core.data import logger
-from lib.core.exception import sqlmapConnectionException
-
-from plugins.generic.connector import Connector as GenericConnector
-
-class Connector(GenericConnector):
-    """
-    Homepage: http://code.google.com/p/ibm-db/
-    User guide: http://code.google.com/p/ibm-db/wiki/README
-    API: http://www.python.org/dev/peps/pep-0249/
-    License: Apache License 2.0
-    """
-
-    def __init__(self):
-        GenericConnector.__init__(self)
-
-    def connect(self):
-        self.initConnection()
-
-        try:     
-            database = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=%s;HOSTNAME=%s;PORT=%s;PROTOCOL=TCPIP;" % (self.db, self.hostname, self.port)
-            self.connector = ibm_db_dbi.connect(database, self.user, self.password)            
-        except ibm_db_dbi.OperationalError, msg:
-            raise sqlmapConnectionException, msg
-
-
-        self.setCursor()
-        self.connected()
-
-    def fetchall(self):
-        try:
-            return self.cursor.fetchall()
-        except ibm_db_dbi.ProgrammingError, msg:
-            logger.warn("(remote) %s" % msg[1])
-            return None
-
-    def execute(self, query):
-        try:
-            self.cursor.execute(query)
-        except (ibm_db_dbi.OperationalError, ibm_db_dbi.ProgrammingError), msg:
-            logger.warn("(remote) %s" % msg[1])
-        except ibm_db_dbi.InternalError, msg:
-            raise sqlmapConnectionException, msg[1]
-
-        self.connector.commit()
-
-    def select(self, query):
-        self.execute(query)
-        return self.fetchall()
+#!/usr/bin/env python
+
+"""
+$Id$
+
+Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
+See the file 'doc/COPYING' for copying permission
+"""
+
+try:
+    import ibm_db_dbi
+except ImportError, _:
+    pass
+
+from lib.core.data import logger
+from lib.core.exception import sqlmapConnectionException
+from plugins.generic.connector import Connector as GenericConnector
+
+class Connector(GenericConnector):
+    """
+    Homepage: http://code.google.com/p/ibm-db/
+    User guide: http://code.google.com/p/ibm-db/wiki/README
+    API: http://www.python.org/dev/peps/pep-0249/
+    License: Apache License 2.0
+    """
+
+    def __init__(self):
+        GenericConnector.__init__(self)
+
+    def connect(self):
+        self.initConnection()
+
+        try:
+            database = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=%s;HOSTNAME=%s;PORT=%s;PROTOCOL=TCPIP;" % (self.db, self.hostname, self.port)
+            self.connector = ibm_db_dbi.connect(database, self.user, self.password)
+        except ibm_db_dbi.OperationalError, msg:
+            raise sqlmapConnectionException, msg
+
+
+        self.setCursor()
+        self.connected()
+
+    def fetchall(self):
+        try:
+            return self.cursor.fetchall()
+        except ibm_db_dbi.ProgrammingError, msg:
+            logger.warn("(remote) %s" % msg[1])
+            return None
+
+    def execute(self, query):
+        try:
+            self.cursor.execute(query)
+        except (ibm_db_dbi.OperationalError, ibm_db_dbi.ProgrammingError), msg:
+            logger.warn("(remote) %s" % msg[1])
+        except ibm_db_dbi.InternalError, msg:
+            raise sqlmapConnectionException, msg[1]
+
+        self.connector.commit()
+
+    def select(self, query):
+        self.execute(query)
+        return self.fetchall()