mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 09:36:35 +03:00
Fixes #5385
This commit is contained in:
parent
4efb3ea840
commit
4f7614412f
|
@ -6,6 +6,7 @@ See the file 'LICENSE' for copying permission
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import codecs
|
import codecs
|
||||||
|
import collections
|
||||||
import inspect
|
import inspect
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
|
@ -95,8 +96,9 @@ def dirtyPatches():
|
||||||
os.urandom = lambda size: "".join(chr(random.randint(0, 255)) for _ in xrange(size))
|
os.urandom = lambda size: "".join(chr(random.randint(0, 255)) for _ in xrange(size))
|
||||||
|
|
||||||
# Reference: https://github.com/bottlepy/bottle/blob/df67999584a0e51ec5b691146c7fa4f3c87f5aac/bottle.py
|
# Reference: https://github.com/bottlepy/bottle/blob/df67999584a0e51ec5b691146c7fa4f3c87f5aac/bottle.py
|
||||||
|
# Reference: https://python.readthedocs.io/en/v2.7.2/library/inspect.html#inspect.getargspec
|
||||||
if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"):
|
if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"):
|
||||||
from inspect import getfullargspec
|
ArgSpec = collections.namedtuple("ArgSpec", ("args", "varargs", "keywords", "defaults"))
|
||||||
|
|
||||||
def makelist(data):
|
def makelist(data):
|
||||||
if isinstance(data, (tuple, list, set, dict)):
|
if isinstance(data, (tuple, list, set, dict)):
|
||||||
|
@ -107,9 +109,9 @@ def dirtyPatches():
|
||||||
return []
|
return []
|
||||||
|
|
||||||
def getargspec(func):
|
def getargspec(func):
|
||||||
spec = getfullargspec(func)
|
spec = inspect.getfullargspec(func)
|
||||||
kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
|
kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
|
||||||
return kwargs, spec[1], spec[2], spec[3]
|
return ArgSpec(kwargs, spec[1], spec[2], spec[3])
|
||||||
|
|
||||||
inspect.getargspec = getargspec
|
inspect.getargspec = getargspec
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ from thirdparty import six
|
||||||
from thirdparty.six import unichr as _unichr
|
from thirdparty.six import unichr as _unichr
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.7.4.2"
|
VERSION = "1.7.4.3"
|
||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
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)
|
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user