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

lib/core/agent.py

@@ -20,9 +20,9 @@ from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import queries
 from lib.core.datatype import advancedDict
+from lib.core.enums import DBMS
+from lib.core.enums import PLACE
 from lib.core.exception import sqlmapNoneDataException
-from lib.core.place import PLACE
-from lib.core.settings import DBMS
 from lib.core.settings import PAYLOAD_DELIMITER
 
 class Agent:

lib/core/common.py

@@ -43,14 +43,14 @@ from lib.core.data import paths
 from lib.core.data import queries
 from lib.core.convert import htmlunescape
 from lib.core.convert import urlencode
+from lib.core.enums import DBMS
+from lib.core.enums import PLACE
 from lib.core.exception import sqlmapFilePathException
 from lib.core.exception import sqlmapGenericException
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.exception import sqlmapMissingDependence
 from lib.core.exception import sqlmapSyntaxException
 from lib.core.optiondict import optDict
-from lib.core.place import PLACE
-from lib.core.settings import DBMS
 from lib.core.settings import DESCRIPTION
 from lib.core.settings import IS_WIN
 from lib.core.settings import PLATFORM

lib/core/enums.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+
+"""
+$Id$
+
+Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
+See the file 'doc/COPYING' for copying permission
+"""
+
+class PRIORITY:
+    LOWEST  = -100
+    LOWER   = -50
+    LOW     = -10
+    NORMAL  = 0
+    HIGH    = 10
+    HIGHER  = 50
+    HIGHEST = 100
+
+class DBMS:
+    MYSQL       = "MySQL"
+    ORACLE      = "Oracle"
+    POSTGRESQL  = "PostgreSQL"
+    MSSQL       = "Microsoft SQL Server"
+    SQLITE      = "SQLite"
+    ACCESS      = "Microsoft Access"
+    FIREBIRD    = "Firebird"
+    MAXDB       = "SAP MaxDB"
+    SYBASE      = "Sybase"
+
+class PLACE:
+    GET     = "GET"
+    POST    = "POST"
+    URI     = "URI"
+    COOKIE  = "Cookie"
+    UA      = "User-Agent"

lib/core/option.py

@@ -42,6 +42,7 @@ from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.data import queries
 from lib.core.datatype import advancedDict
+from lib.core.enums import PRIORITY
 from lib.core.exception import sqlmapFilePathException
 from lib.core.exception import sqlmapGenericException
 from lib.core.exception import sqlmapMissingDependence
@@ -51,7 +52,6 @@ from lib.core.exception import sqlmapSyntaxException
 from lib.core.exception import sqlmapUnsupportedDBMSException
 from lib.core.exception import sqlmapUserQuitException
 from lib.core.optiondict import optDict
-from lib.core.priority import PRIORITY
 from lib.core.settings import IS_WIN
 from lib.core.settings import PLATFORM
 from lib.core.settings import PYVERSION

lib/core/place.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-"""
-$Id$
-
-Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
-See the file 'doc/COPYING' for copying permission
-"""
-
-class PLACE:
-    GET  = "GET"
-    POST   = "POST"
-    URI     = "URI"
-    COOKIE  = "Cookie"
-    UA    = "User-Agent"

lib/core/priority.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-
-"""
-$Id$
-
-Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
-See the file 'doc/COPYING' for copying permission
-"""
-
-class PRIORITY:
-    LOWEST  = -100
-    LOWER   = -50
-    LOW     = -10
-    NORMAL  = 0
-    HIGH    = 10
-    HIGHER  = 50
-    HIGHEST = 100

lib/core/session.py

@@ -15,7 +15,7 @@ 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.place import PLACE
+from lib.core.enums import PLACE
 from lib.core.settings import MSSQL_ALIASES
 from lib.core.settings import MYSQL_ALIASES
 from lib.core.settings import PGSQL_ALIASES

lib/core/settings.py

@@ -90,17 +90,6 @@ SYBASE_ALIASES      = [ "sybase", "sybase sql server" ]
 SUPPORTED_DBMS      = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + MAXDB_ALIASES + SYBASE_ALIASES
 SUPPORTED_OS        = ( "linux", "windows" )
 
-class DBMS:
-    MYSQL       = "MySQL"
-    ORACLE      = "Oracle"
-    POSTGRESQL  = "PostgreSQL"
-    MSSQL       = "Microsoft SQL Server"
-    SQLITE      = "SQLite"
-    ACCESS      = "Microsoft Access"
-    FIREBIRD    = "Firebird"
-    MAXDB       = "SAP MaxDB"
-    SYBASE      = "Sybase"
-
 SQL_STATEMENTS      = {
                        "SQL SELECT statement":  (
                              "select ",