From 4f7614412ffa96915df2557e4d514ca3426c8ee3 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 5 Apr 2023 10:56:36 +0200 Subject: [PATCH] Fixes #5385 --- lib/core/patch.py | 8 +++++--- lib/core/settings.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/core/patch.py b/lib/core/patch.py index 0fe06751b..9136b70a4 100644 --- a/lib/core/patch.py +++ b/lib/core/patch.py @@ -6,6 +6,7 @@ See the file 'LICENSE' for copying permission """ import codecs +import collections import inspect import os import random @@ -95,8 +96,9 @@ def dirtyPatches(): 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://python.readthedocs.io/en/v2.7.2/library/inspect.html#inspect.getargspec if not hasattr(inspect, "getargspec") and hasattr(inspect, "getfullargspec"): - from inspect import getfullargspec + ArgSpec = collections.namedtuple("ArgSpec", ("args", "varargs", "keywords", "defaults")) def makelist(data): if isinstance(data, (tuple, list, set, dict)): @@ -107,9 +109,9 @@ def dirtyPatches(): return [] def getargspec(func): - spec = getfullargspec(func) + spec = inspect.getfullargspec(func) 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 diff --git a/lib/core/settings.py b/lib/core/settings.py index ff2e6b39d..3a1ffb448 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.7.4.2" +VERSION = "1.7.4.3" 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)