From e7576a3b11b6d983c222367807336f96b1374c1a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 18 Jan 2013 11:21:23 +0100
Subject: [PATCH] Better naming

---
 plugins/dbms/access/connector.py      | 2 +-
 plugins/dbms/db2/connector.py         | 2 +-
 plugins/dbms/firebird/connector.py    | 2 +-
 plugins/dbms/mssqlserver/connector.py | 2 +-
 plugins/dbms/mysql/connector.py       | 2 +-
 plugins/dbms/oracle/connector.py      | 2 +-
 plugins/dbms/postgresql/connector.py  | 2 +-
 plugins/dbms/sqlite/connector.py      | 2 +-
 plugins/dbms/sybase/connector.py      | 2 +-
 plugins/generic/connector.py          | 5 +----
 10 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
index e7334edeb..b0aa371e9 100644
--- a/plugins/dbms/access/connector.py
+++ b/plugins/dbms/access/connector.py
@@ -45,7 +45,7 @@ class Connector(GenericConnector):
         except (pyodbc.Error, pyodbc.OperationalError), msg:
             raise SqlmapConnectionException(msg[1])
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/db2/connector.py b/plugins/dbms/db2/connector.py
index d80e1d026..507edaab4 100644
--- a/plugins/dbms/db2/connector.py
+++ b/plugins/dbms/db2/connector.py
@@ -38,7 +38,7 @@ class Connector(GenericConnector):
             raise SqlmapConnectionException(msg)
 
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/firebird/connector.py b/plugins/dbms/firebird/connector.py
index c903d4990..8b9600c90 100644
--- a/plugins/dbms/firebird/connector.py
+++ b/plugins/dbms/firebird/connector.py
@@ -43,7 +43,7 @@ class Connector(GenericConnector):
                 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.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/mssqlserver/connector.py b/plugins/dbms/mssqlserver/connector.py
index 203aa7053..d0e6738ea 100644
--- a/plugins/dbms/mssqlserver/connector.py
+++ b/plugins/dbms/mssqlserver/connector.py
@@ -44,7 +44,7 @@ class Connector(GenericConnector):
         except pymssql.OperationalError, msg:
             raise SqlmapConnectionException(msg)
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/mysql/connector.py b/plugins/dbms/mysql/connector.py
index 7eb81d734..83ef8f402 100644
--- a/plugins/dbms/mysql/connector.py
+++ b/plugins/dbms/mysql/connector.py
@@ -39,7 +39,7 @@ class Connector(GenericConnector):
         except (pymysql.OperationalError, pymysql.InternalError), msg:
             raise SqlmapConnectionException(msg[1])
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
index 5c4cd678f..595460383 100644
--- a/plugins/dbms/oracle/connector.py
+++ b/plugins/dbms/oracle/connector.py
@@ -48,7 +48,7 @@ class Connector(GenericConnector):
             except (cx_Oracle.OperationalError, cx_Oracle.DatabaseError), msg:
                 raise SqlmapConnectionException(msg)
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/postgresql/connector.py b/plugins/dbms/postgresql/connector.py
index b53e232bf..8b0d6d585 100644
--- a/plugins/dbms/postgresql/connector.py
+++ b/plugins/dbms/postgresql/connector.py
@@ -41,7 +41,7 @@ class Connector(GenericConnector):
 
         self.connector.set_client_encoding('UNICODE')
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
index 55584dbfd..858ac4bfd 100644
--- a/plugins/dbms/sqlite/connector.py
+++ b/plugins/dbms/sqlite/connector.py
@@ -63,7 +63,7 @@ class Connector(GenericConnector):
             except (self.__sqlite.DatabaseError, self.__sqlite.OperationalError), msg:
                 raise SqlmapConnectionException(msg[0])
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/dbms/sybase/connector.py b/plugins/dbms/sybase/connector.py
index 203aa7053..d0e6738ea 100644
--- a/plugins/dbms/sybase/connector.py
+++ b/plugins/dbms/sybase/connector.py
@@ -44,7 +44,7 @@ class Connector(GenericConnector):
         except pymssql.OperationalError, msg:
             raise SqlmapConnectionException(msg)
 
-        self.setCursor()
+        self.initCursor()
         self.connected()
 
     def fetchall(self):
diff --git a/plugins/generic/connector.py b/plugins/generic/connector.py
index 92f57ee61..7f72a4a61 100644
--- a/plugins/generic/connector.py
+++ b/plugins/generic/connector.py
@@ -41,12 +41,9 @@ class Connector:
         self.connector = None
         self.cursor = None
 
-    def setCursor(self):
+    def initCursor(self):
         self.cursor = self.connector.cursor()
 
-    def getCursor(self):
-        return self.cursor
-
     def close(self):
         try:
             self.cursor.close()