Some more drei stuff

plugins/dbms/db2/fingerprint.py

@@ -15,6 +15,7 @@ from lib.core.enums import OS
 from lib.core.session import setDbms
 from lib.core.settings import DB2_ALIASES
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/firebird/fingerprint.py

@@ -19,6 +19,7 @@ from lib.core.session import setDbms
 from lib.core.settings import FIREBIRD_ALIASES
 from lib.core.settings import METADB_SUFFIX
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/h2/syntax.py

@@ -5,6 +5,7 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
+from lib.utils.xrange import xrange
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/hsqldb/syntax.py

@@ -5,6 +5,7 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
+from lib.utils.xrange import xrange
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/maxdb/fingerprint.py

@@ -16,6 +16,7 @@ from lib.core.session import setDbms
 from lib.core.settings import MAXDB_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request
+from lib.utils.xrange import xrange
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/mssqlserver/enumeration.py

@@ -28,6 +28,7 @@ from lib.core.enums import PAYLOAD
 from lib.core.exception import SqlmapNoneDataException
 from lib.core.settings import CURRENT_DB
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 from thirdparty import six
 

plugins/dbms/mssqlserver/filesystem.py

@@ -24,6 +24,7 @@ from lib.core.enums import PAYLOAD
 from lib.core.exception import SqlmapNoneDataException
 from lib.core.exception import SqlmapUnsupportedFeatureException
 from lib.request import inject
+from lib.utils.xrange import xrange
 
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 

plugins/dbms/mssqlserver/syntax.py

@@ -5,6 +5,7 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
+from lib.utils.xrange import xrange
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/mssqlserver/takeover.py

@@ -11,6 +11,7 @@ from lib.core.common import Backend
 from lib.core.data import logger
 from lib.core.exception import SqlmapUnsupportedFeatureException
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/mysql/filesystem.py

@@ -26,6 +26,7 @@ from lib.core.exception import SqlmapNoneDataException
 from lib.request import inject
 from lib.request.connect import Connect as Request
 from lib.techniques.union.use import unionUse
+from lib.utils.xrange import xrange
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/mysql/fingerprint.py

@@ -21,6 +21,7 @@ from lib.core.enums import OS
 from lib.core.session import setDbms
 from lib.core.settings import MYSQL_ALIASES
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/oracle/enumeration.py

@@ -21,6 +21,7 @@ from lib.core.enums import EXPECTED
 from lib.core.enums import PAYLOAD
 from lib.core.exception import SqlmapNoneDataException
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):

plugins/dbms/oracle/syntax.py

@@ -5,6 +5,7 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
+from lib.utils.xrange import xrange
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/postgresql/filesystem.py

@@ -12,6 +12,7 @@ from lib.core.data import logger
 from lib.core.exception import SqlmapUnsupportedFeatureException
 from lib.core.settings import LOBLKSIZE
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/sybase/fingerprint.py

@@ -16,6 +16,7 @@ from lib.core.enums import OS
 from lib.core.session import setDbms
 from lib.core.settings import SYBASE_ALIASES
 from lib.request import inject
+from lib.utils.xrange import xrange
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/sybase/syntax.py

@@ -5,6 +5,7 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
+from lib.utils.xrange import xrange
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/generic/filesystem.py

@@ -31,6 +31,7 @@ from lib.core.exception import SqlmapUndefinedMethod
 from lib.core.settings import TAKEOVER_TABLE_PREFIX
 from lib.core.settings import UNICODE_ENCODING
 from lib.request import inject
+from lib.utils.xrange import xrange
 
 class Filesystem:
     """
@@ -70,7 +71,7 @@ class Filesystem:
             sameFile = None
 
             if isNumPosStrValue(remoteFileSize):
-                remoteFileSize = long(remoteFileSize)
+                remoteFileSize = int(remoteFileSize)
                 localFile = getUnicode(localFile, encoding=sys.getfilesystemencoding() or UNICODE_ENCODING)
                 sameFile = False
 

plugins/generic/users.py

@@ -42,6 +42,7 @@ from lib.request import inject
 from lib.utils.hash import attackCachedUsersPasswords
 from lib.utils.hash import storeHashesToFile
 from lib.utils.pivotdumptable import pivotDumpTable
+from lib.utils.xrange import xrange
 
 class Users:
     """