Code restyling

stamparm · stamparm · commit f936746423aa · 2013-04-15T14:31:27.000+02:00
diff --git a/lib/utils/sqlalchemy.py b/lib/utils/sqlalchemy.py
@@ -41,7 +41,7 @@ def connect(self):
             except Exception, msg:
                 raise SqlmapConnectionException(msg[0])
 
-            self.connected()
+            self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
@@ -46,7 +46,7 @@ def connect(self):
             raise SqlmapConnectionException(msg[1])
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/db2/connector.py b/plugins/dbms/db2/connector.py
@@ -39,7 +39,7 @@ def connect(self):
 
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/firebird/connector.py b/plugins/dbms/firebird/connector.py
@@ -43,8 +43,9 @@ def connect(self):
                 user=self.user.encode(UNICODE_ENCODING), password=self.password.encode(UNICODE_ENCODING), charset="UTF8")  # Reference: http://www.daniweb.com/forums/thread248499.html
         except kinterbasdb.OperationalError, msg:
             raise SqlmapConnectionException(msg[1])
+
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/mssqlserver/connector.py b/plugins/dbms/mssqlserver/connector.py
@@ -45,7 +45,7 @@ def connect(self):
             raise SqlmapConnectionException(msg)
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/mysql/connector.py b/plugins/dbms/mysql/connector.py
@@ -40,7 +40,7 @@ def connect(self):
             raise SqlmapConnectionException(msg[1])
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
@@ -49,7 +49,7 @@ def connect(self):
                 raise SqlmapConnectionException(msg)
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/postgresql/connector.py b/plugins/dbms/postgresql/connector.py
@@ -42,7 +42,7 @@ def connect(self):
         self.connector.set_client_encoding('UNICODE')
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
@@ -64,7 +64,7 @@ def connect(self):
                 raise SqlmapConnectionException(msg[0])
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/dbms/sybase/connector.py b/plugins/dbms/sybase/connector.py
@@ -45,7 +45,7 @@ def connect(self):
             raise SqlmapConnectionException(msg)
 
         self.initCursor()
-        self.connected()
+        self.printConnected()
 
     def fetchall(self):
         try:
diff --git a/plugins/generic/connector.py b/plugins/generic/connector.py
@@ -29,7 +29,7 @@ def initConnection(self):
         self.port = conf.port
         self.db = conf.dbmsDb
 
-    def connected(self):
+    def printConnected(self):
         infoMsg = "connection to %s server %s" % (conf.dbms, self.hostname)
         infoMsg += ":%d established" % self.port
         logger.info(infoMsg)
