further refactoring (all enumerations are now put into enums.py)

plugins/dbms/access/enumeration.py

@@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.data import logger
-from lib.core.settings import DBMS
+from lib.core.enums import DBMS
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 

plugins/dbms/access/fingerprint.py

@@ -19,8 +19,8 @@ from lib.core.common import wasLastRequestError
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import ACCESS_ALIASES
 from lib.request.connect import Connect as Request
 

plugins/dbms/firebird/enumeration.py

@@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.data import logger
-from lib.core.settings import DBMS
+from lib.core.enums import DBMS
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 

plugins/dbms/firebird/fingerprint.py

@@ -19,8 +19,8 @@ from lib.core.common import randomRange
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import FIREBIRD_ALIASES
 from lib.request.connect import Connect as Request
 

plugins/dbms/maxdb/enumeration.py

@@ -9,7 +9,7 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.settings import DBMS
+from lib.core.enums import DBMS
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 

plugins/dbms/maxdb/fingerprint.py

@@ -19,8 +19,8 @@ from lib.core.common import randomRange
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import MAXDB_ALIASES
 from lib.request.connect import Connect as Request
 

plugins/dbms/mssqlserver/enumeration.py

@@ -13,8 +13,8 @@ from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapNoneDataException
-from lib.core.settings import DBMS
 from lib.request import inject
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration

plugins/dbms/mssqlserver/fingerprint.py

@@ -16,8 +16,8 @@ from lib.core.common import randomInt
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import MSSQL_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request

plugins/dbms/mysql/enumeration.py

@@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.settings import DBMS
+from lib.core.enums import DBMS
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):

plugins/dbms/mysql/filesystem.py

@@ -11,8 +11,8 @@ from lib.core.common import randomStr
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import PLACE
 from lib.core.exception import sqlmapNoneDataException
-from lib.core.place import PLACE
 from lib.request import inject
 from lib.techniques.inband.union.test import unionTest
 from lib.techniques.inband.union.use import unionUse

plugins/dbms/mysql/fingerprint.py

@@ -18,8 +18,8 @@ from lib.core.common import randomInt
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import MYSQL_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request

plugins/dbms/oracle/enumeration.py

@@ -13,8 +13,8 @@ from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapNoneDataException
-from lib.core.settings import DBMS
 from lib.request import inject
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration

plugins/dbms/oracle/fingerprint.py

@@ -16,8 +16,8 @@ from lib.core.common import getHtmlErrorFp
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import ORACLE_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request

plugins/dbms/postgresql/enumeration.py

@@ -7,7 +7,7 @@ Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.settings import DBMS
+from lib.core.enums import DBMS
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):

plugins/dbms/postgresql/fingerprint.py

@@ -18,8 +18,8 @@ from lib.core.common import randomInt
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import PGSQL_ALIASES
 from lib.core.settings import PGSQL_SYSTEM_DBS
 from lib.request import inject

plugins/dbms/sqlite/enumeration.py

@@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.data import conf
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapUnsupportedFeatureException
-from lib.core.settings import DBMS
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 

plugins/dbms/sqlite/fingerprint.py

@@ -14,8 +14,8 @@ from lib.core.common import getHtmlErrorFp
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import SQLITE_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request

plugins/dbms/sybase/enumeration.py

@@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.data import conf
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapUnsupportedFeatureException
-from lib.core.settings import DBMS
 
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 

plugins/dbms/sybase/fingerprint.py

@@ -15,8 +15,8 @@ from lib.core.common import randomInt
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.session import setDbms
-from lib.core.settings import DBMS
 from lib.core.settings import SYBASE_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request

plugins/generic/enumeration.py

@@ -30,12 +30,12 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.data import queries
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapMissingMandatoryOptionException
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.exception import sqlmapUserQuitException
 from lib.core.session import setOs
-from lib.core.settings import DBMS
 from lib.core.settings import SQL_STATEMENTS
 from lib.core.shell import autoCompletion
 from lib.core.unescaper import unescaper

plugins/generic/filesystem.py

@@ -18,8 +18,8 @@ from lib.core.common import readInput
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapUndefinedMethod
-from lib.core.settings import DBMS
 from lib.request import inject
 from lib.techniques.outband.stacked import stackedTest
 

plugins/generic/misc.py

@@ -18,10 +18,10 @@ from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.session import setRemoteTempPath
-from lib.core.settings import DBMS
 from lib.request import inject
 from lib.techniques.outband.stacked import stackedTest
 

plugins/generic/takeover.py

@@ -14,13 +14,13 @@ from lib.core.common import runningAsAdmin
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
+from lib.core.enums import DBMS
 from lib.core.exception import sqlmapMissingDependence
 from lib.core.exception import sqlmapMissingMandatoryOptionException
 from lib.core.exception import sqlmapMissingPrivileges
 from lib.core.exception import sqlmapNotVulnerableException
 from lib.core.exception import sqlmapUndefinedMethod
 from lib.core.exception import sqlmapUnsupportedDBMSException
-from lib.core.settings import DBMS
 from lib.takeover.abstraction import Abstraction
 from lib.takeover.icmpsh import ICMPsh
 from lib.takeover.metasploit import Metasploit