mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-12-27 09:59:07 +00:00
Switching from old odict (non-concise ordering compared to collections) to ordereddict
This commit is contained in:
@@ -177,7 +177,7 @@ from thirdparty.clientform.clientform import ParseResponse
|
||||
from thirdparty.clientform.clientform import ParseError
|
||||
from thirdparty.colorama.initialise import init as coloramainit
|
||||
from thirdparty.magic import magic
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
from thirdparty.termcolor.termcolor import colored
|
||||
|
||||
class UnicodeRawConfigParser(RawConfigParser):
|
||||
|
||||
@@ -8,7 +8,7 @@ See the file 'LICENSE' for copying permission
|
||||
import copy
|
||||
import types
|
||||
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
|
||||
class AttribDict(dict):
|
||||
"""
|
||||
|
||||
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
|
||||
from lib.core.enums import OS
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.3.3.15"
|
||||
VERSION = "1.3.3.16"
|
||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||
|
||||
@@ -73,7 +73,7 @@ from lib.core.settings import URI_INJECTABLE_REGEX
|
||||
from lib.core.settings import USER_AGENT_ALIASES
|
||||
from lib.core.settings import XML_RECOGNITION_REGEX
|
||||
from lib.utils.hashdb import HashDB
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
|
||||
def _setRequestParams():
|
||||
"""
|
||||
|
||||
@@ -47,7 +47,7 @@ from lib.parse.headers import headersParser
|
||||
from lib.parse.html import htmlParser
|
||||
from lib.utils.htmlentities import htmlEntities
|
||||
from thirdparty.chardet import detect
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
|
||||
def forgeHeaders(items=None, base=None):
|
||||
"""
|
||||
|
||||
@@ -122,7 +122,7 @@ from lib.request.basic import processResponse
|
||||
from lib.request.direct import direct
|
||||
from lib.request.comparison import comparison
|
||||
from lib.request.methodrequest import MethodRequest
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
from thirdparty.socks.socks import ProxyError
|
||||
|
||||
class Connect(object):
|
||||
|
||||
@@ -59,7 +59,7 @@ from lib.core.threads import runThreads
|
||||
from lib.core.unescaper import unescaper
|
||||
from lib.request.connect import Connect as Request
|
||||
from lib.utils.progress import ProgressBar
|
||||
from thirdparty.odict.odict import OrderedDict
|
||||
from thirdparty.odict import OrderedDict
|
||||
|
||||
def _oneShotUnionUse(expression, unpack=True, limited=False):
|
||||
retVal = hashDBRetrieve("%s%s" % (conf.hexConvert or False, expression), checkConf=True) # as UNION data is stored raw unconverted
|
||||
|
||||
Reference in New Issue
Block a user