Fixing Python3.10 incompatibility

stamparm · stamparm · commit fd137b49ef1c · 2021-01-15T09:17:33.000+01:00
diff --git a/lib/core/datatype.py b/lib/core/datatype.py
@@ -10,6 +10,7 @@
 import types
 
 from thirdparty.odict import OrderedDict
+from thirdparty.six.moves import collections_abc
 
 class AttribDict(dict):
     """
@@ -159,7 +160,7 @@ def keys(self):
         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
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # 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_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
@@ -223,6 +223,12 @@ def get_code(self, fullname):
         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__)
 
 
