From fd137b49ef1cd51f17ce85c75d7c85b72018bf72 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 15 Jan 2021 09:17:33 +0100 Subject: [PATCH] Fixing Python3.10 incompatibility --- lib/core/datatype.py | 3 ++- lib/core/settings.py | 2 +- thirdparty/six/__init__.py | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/core/datatype.py b/lib/core/datatype.py index ab3032dee..12838b977 100644 --- a/lib/core/datatype.py +++ b/lib/core/datatype.py @@ -10,6 +10,7 @@ import copy import types from thirdparty.odict import OrderedDict +from thirdparty.six.moves import collections_abc class AttribDict(dict): """ @@ -159,7 +160,7 @@ class LRUDict(object): return self.cache.keys() # Reference: https://code.activestate.com/recipes/576694/ -class OrderedSet(collections.MutableSet): +class OrderedSet(collections_abc.MutableSet): """ This class defines the set with ordered (as added) items diff --git a/lib/core/settings.py b/lib/core/settings.py index 54f820865..c6ae1e02e 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.5.1.29" +VERSION = "1.5.1.30" 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) diff --git a/thirdparty/six/__init__.py b/thirdparty/six/__init__.py index 83f69783d..d162d09cd 100644 --- a/thirdparty/six/__init__.py +++ b/thirdparty/six/__init__.py @@ -223,6 +223,12 @@ class _SixMetaPathImporter(object): return None get_source = get_code # same as get_code + def create_module(self, spec): + return self.load_module(spec.name) + + def exec_module(self, module): + pass + _importer = _SixMetaPathImporter(__name__)