Fixing Python3.10 incompatibility

This commit is contained in:
Miroslav Stampar 2021-01-15 09:17:33 +01:00
parent 6fa5922fbd
commit fd137b49ef
3 changed files with 9 additions and 2 deletions

View File

@ -10,6 +10,7 @@ import copy
import types import types
from thirdparty.odict import OrderedDict from thirdparty.odict import OrderedDict
from thirdparty.six.moves import collections_abc
class AttribDict(dict): class AttribDict(dict):
""" """
@ -159,7 +160,7 @@ class LRUDict(object):
return self.cache.keys() return self.cache.keys()
# Reference: https://code.activestate.com/recipes/576694/ # 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 This class defines the set with ordered (as added) items

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
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.5.1.29" VERSION = "1.5.1.30"
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)

View File

@ -223,6 +223,12 @@ class _SixMetaPathImporter(object):
return None return None
get_source = get_code # same as get_code 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__) _importer = _SixMetaPathImporter(__name__)