Patch for Python 2.6

stamparm · stamparm · commit 09be7cb361a0 · 2019-03-28T22:54:05.000+01:00
diff --git a/extra/cloak/cloak.py b/extra/cloak/cloak.py
@@ -17,7 +17,7 @@
 from optparse import OptionError
 from optparse import OptionParser
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 def hideAscii(data):
diff --git a/extra/dbgtool/dbgtool.py b/extra/dbgtool/dbgtool.py
@@ -34,7 +34,7 @@ def convert(inputFile):
     fileContent = fp.read()
 
     for fileChar in fileContent:
-        unsignedFileChar = fileChar if sys.version_info.major > 2 else ord(fileChar)
+        unsignedFileChar = fileChar if sys.version_info >= (3, 0) else ord(fileChar)
 
         if unsignedFileChar != 0:
             counter2 += 1
diff --git a/extra/safe2bin/safe2bin.py b/extra/safe2bin/safe2bin.py
@@ -18,7 +18,7 @@
 from optparse import OptionError
 from optparse import OptionParser
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 # Regex used for recognition of hex encoded characters
diff --git a/lib/core/compat.py b/lib/core/compat.py
@@ -166,7 +166,7 @@ def whseed(self, a=None):
 def choose_boundary():
     return uuid.uuid4().hex
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 else:
     xrange = xrange
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -17,7 +17,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.3.75"
+VERSION = "1.3.3.76"
 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/beautifulsoup/beautifulsoup.py b/thirdparty/beautifulsoup/beautifulsoup.py
@@ -89,7 +89,7 @@
 import re
 import sys
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 try:
diff --git a/thirdparty/chardet/eucjpprober.py b/thirdparty/chardet/eucjpprober.py
@@ -33,7 +33,7 @@
 from .jpcntx import EUCJPContextAnalysis
 from .mbcssm import EUCJPSMModel
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 class EUCJPProber(MultiByteCharSetProber):
diff --git a/thirdparty/chardet/mbcharsetprober.py b/thirdparty/chardet/mbcharsetprober.py
@@ -31,7 +31,7 @@
 from . import constants
 from .charsetprober import CharSetProber
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 class MultiByteCharSetProber(CharSetProber):
diff --git a/thirdparty/chardet/sjisprober.py b/thirdparty/chardet/sjisprober.py
@@ -33,7 +33,7 @@
 from .mbcssm import SJISSMModel
 from . import constants
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 class SJISProber(MultiByteCharSetProber):
diff --git a/thirdparty/chardet/utf8prober.py b/thirdparty/chardet/utf8prober.py
@@ -31,7 +31,7 @@
 from .codingstatemachine import CodingStateMachine
 from .mbcssm import UTF8SMModel
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 ONE_CHAR_PROB = 0.5
diff --git a/thirdparty/clientform/clientform.py b/thirdparty/clientform/clientform.py
@@ -109,7 +109,7 @@ def _show_debug_messages():
 
 import sys, types, copy, re, random
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 # monkeypatch to fix http://www.python.org/sf/803422 :-(
diff --git a/thirdparty/fcrypt/fcrypt.py b/thirdparty/fcrypt/fcrypt.py
@@ -121,7 +121,7 @@
 
 import string, struct, sys
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 _ITERATIONS = 16
diff --git a/thirdparty/gprof2dot/gprof2dot.py b/thirdparty/gprof2dot/gprof2dot.py
@@ -32,7 +32,7 @@
 import sys
 import xml.parsers.expat
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 try:
diff --git a/thirdparty/xdot/xdot.py b/thirdparty/xdot/xdot.py
@@ -39,7 +39,7 @@
 import pango
 import pangocairo
 
-if sys.version_info.major > 2:
+if sys.version_info >= (3, 0):
     xrange = range
 
 # See http://www.graphviz.org/pub/scm/graphviz-cairo/plugin/cairo/gvrender_cairo.c
